Merge branch 'master' into dev/vs-2019

build.cake

@@ -442,7 +442,7 @@ Task ("nuget")
         ValidPackageNamespace = new [] { "SkiaSharp", "HarfBuzzSharp" },
     };
 
-    var nupkgFiles = GetFiles ("./output/nugets/*.nupkg");
+    var nupkgFiles = GetFiles ($"{OUTPUT_NUGETS_PATH}/*.nupkg");
 
     Information ("Found ({0}) Nuget's to validate", nupkgFiles.Count ());
 

cake/UtilsManaged.cake

@@ -1,7 +1,4 @@
-
-var MSBuildNS = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/2003";
-
-void PackageNuGet (FilePath nuspecPath, DirectoryPath outputPath)
+void PackageNuGet(FilePath nuspecPath, DirectoryPath outputPath)
 {
     EnsureDirectoryExists(outputPath);
     NuGetPack(nuspecPath, new NuGetPackSettings {
@@ -68,11 +65,11 @@ IEnumerable<(string Name, string Value)> CreateTraitsDictionary(string args)
     }
 }
 
-void DecompressArchive (FilePath archive, DirectoryPath outputDir)
+void DecompressArchive(FilePath archive, DirectoryPath outputDir)
 {
-    using (var stream = System.IO.File.OpenRead (archive.FullPath))
-    using (var reader = ReaderFactory.Open (stream)) {
-        while (reader.MoveToNextEntry ()) {
+    using (var stream = System.IO.File.OpenRead(archive.FullPath))
+    using (var reader = ReaderFactory.Open(stream)) {
+        while(reader.MoveToNextEntry()) {
             if (!reader.Entry.IsDirectory) {
                 reader.WriteEntryToDirectory(outputDir.FullPath, new ExtractionOptions {
                     ExtractFullPath = true,
@@ -83,154 +80,6 @@ void DecompressArchive (FilePath archive, DirectoryPath outputDir)
     }
 }
 
-void CreateSamplesDirectory (DirectoryPath samplesDirPath, DirectoryPath outputDirPath, string versionSuffix = "")
-{
-    samplesDirPath = MakeAbsolute (samplesDirPath);
-    outputDirPath = MakeAbsolute (outputDirPath);
-
-    var solutionProjectRegex = new Regex(@",\s*""(.*?\.\w{2}proj)"", ""(\{.*?\})""");
-
-    EnsureDirectoryExists (outputDirPath);
-    CleanDirectory (outputDirPath);
-
-    var ignoreBinObj = new GlobberSettings {
-        Predicate = fileSystemInfo => {
-            var segments = fileSystemInfo.Path.Segments;
-            var keep = segments.All (s =>
-                !s.Equals ("bin", StringComparison.OrdinalIgnoreCase) &&
-                !s.Equals ("obj", StringComparison.OrdinalIgnoreCase) &&
-                !s.Equals ("AppPackages", StringComparison.OrdinalIgnoreCase) &&
-                !s.Equals (".vs", StringComparison.OrdinalIgnoreCase));
-            return keep;
-        }
-    };
-
-    var files = GetFiles ($"{samplesDirPath}/**/*", ignoreBinObj);
-    foreach (var file in files) {
-        var rel = samplesDirPath.GetRelativePath (file);
-        var dest = outputDirPath.CombineWithFilePath (rel);
-        var ext = file.GetExtension () ?? "";
-
-        if (ext.Equals (".sln", StringComparison.OrdinalIgnoreCase)) {
-            var lines = FileReadLines (file.FullPath).ToList ();
-            var guids = new List<string> ();
-
-            // remove projects that aren't samples
-            for (var i = 0; i < lines.Count; i++) {
-                var line = lines [i];
-                var m = solutionProjectRegex.Match (line);
-                if (!m.Success)
-                    continue;
-
-                // get the path of the project relative to the samples directory
-                var relProjectPath = (FilePath) m.Groups [1].Value;
-                var absProjectPath = GetFullPath (file, relProjectPath);
-                var relSamplesPath = samplesDirPath.GetRelativePath (absProjectPath);
-                if (!relSamplesPath.FullPath.StartsWith (".."))
-                    continue;
-
-                Debug ($"Removing the project '{relProjectPath}' for solution '{rel}'.");
-
-                // skip the next line as it is the "EndProject" line
-                guids.Add (m.Groups [2].Value.ToLower ());
-                lines.RemoveAt (i--);
-                lines.RemoveAt (i--);
-            }
-
-            // remove all the other references to this guid
-            if (guids.Count > 0) {
-                for (var i = 0; i < lines.Count; i++) {
-                    var line = lines [i];
-                    foreach (var guid in guids) {
-                        if (line.ToLower ().Contains (guid)) {
-                            lines.RemoveAt (i--);
-                        }
-                    }
-                }
-            }
-
-            // save the solution
-            EnsureDirectoryExists (dest.GetDirectory ());
-            FileWriteLines (dest, lines.ToArray ());
-        } else if (ext.Equals (".csproj", StringComparison.OrdinalIgnoreCase)) {
-            var xdoc = XDocument.Load (file.FullPath);
-
-            // process all the files and project references
-            var projItems = xdoc.Root
-                .Elements ().Where (e => e.Name.LocalName == "ItemGroup")
-                .Elements ().Where (e => !string.IsNullOrWhiteSpace (e.Attribute ("Include")?.Value))
-                .ToArray ();
-            foreach (var projItem in projItems) {
-                // get files in the include
-                var relFilePath = (FilePath) projItem.Attribute ("Include").Value;
-                var absFilePath = GetFullPath (file, relFilePath);
-
-                // ignore files in the samples directory
-                var relSamplesPath = samplesDirPath.GetRelativePath (absFilePath);
-                if (!relSamplesPath.FullPath.StartsWith (".."))
-                    continue;
-
-                // substitute <ProjectReference> with <PackageReference>
-                if (projItem.Name.LocalName == "ProjectReference" && FileExists (absFilePath)) {
-                    var xReference = XDocument.Load (absFilePath.FullPath);
-                    var packagingGroup = xReference.Root
-                        .Elements ().Where (e => e.Name.LocalName == "PropertyGroup")
-                        .Elements ().Where (e => e.Name.LocalName == "PackagingGroup")
-                        .FirstOrDefault ()?.Value;
-                    var version = GetVersion (packagingGroup);
-                    if (!string.IsNullOrWhiteSpace (version)) {
-                        Debug ($"Substituting project reference {relFilePath} for project {rel}.");
-                        var name = projItem.Name.Namespace + "PackageReference";
-                        var suffix = string.IsNullOrEmpty (versionSuffix) ? "" : $"-{versionSuffix}";
-                        projItem.AddAfterSelf (new XElement (name, new object[] {
-                            new XAttribute("Include", packagingGroup),
-                            new XAttribute("Version", version + suffix),
-                        }));
-                    } else {
-                        Warning ($"Unable to find version information for package '{packagingGroup}'.");
-                    }
-                } else {
-                    Debug ($"Removing the file '{relFilePath}' for project '{rel}'.");
-                }
-
-                // remove the element as it will be outside the sample directory
-                projItem.Remove ();
-            }
-
-            // process all the imports
-            var imports = xdoc.Root
-                .Elements ().Where (e =>
-                    e.Name.LocalName == "Import" &&
-                    !string.IsNullOrWhiteSpace (e.Attribute ("Project")?.Value))
-                .ToArray ();
-            foreach (var import in imports) {
-                var project = import.Attribute ("Project").Value;
-
-                // skip files inside the samples directory or do not exist
-                var absProject = GetFullPath (file, project);
-                var relSamplesPath = samplesDirPath.GetRelativePath (absProject);
-                if (!relSamplesPath.FullPath.StartsWith (".."))
-                    continue;
-
-                Debug ($"Removing import '{project}' for project '{rel}'.");
-
-                // not inside the samples directory, so needs to be removed
-                import.Remove ();
-            }
-
-            // save the project
-            EnsureDirectoryExists (dest.GetDirectory ());
-            xdoc.Save (dest.FullPath);
-        } else {
-            EnsureDirectoryExists (dest.GetDirectory ());
-            CopyFile (file, dest);
-        }
-    }
-
-    DeleteFiles ($"{outputDirPath}/README.md");
-    MoveFile ($"{outputDirPath}/README.zip.md", $"{outputDirPath}/README.md");
-}
-
 IEnumerable<(DirectoryPath path, string platform)> GetPlatformDirectories(DirectoryPath rootDir)
 {
     var platformDirs = GetDirectories($"{rootDir}/*");