Merge branch 'master' into invalid-cast-classInspector-components

nhibernate · Sep 18, 2020 · f773fae · f773fae
2 parents 89ee23a + 8431c02
commit f773fae
Show file tree

Hide file tree

Showing 24 changed files with 66 additions and 336 deletions.
diff --git a/build.cake b/build.cake
@@ -15,16 +15,12 @@ var SrcProjects = new [] { "FluentNHibernate" };
 var TestProjects = new [] { "FluentNHibernate.Testing" };
 var SpecProjects = new [] { "FluentNHibernate.Specs" };
 
-var NHibernateNuspecXPath = "/package/meta:metadata/meta:dependencies/meta:dependency[@id='NHibernate']/@version";
-var NHibernateNuspecXPathWithGroup = "/package/meta:metadata/meta:dependencies/meta:group/meta:dependency[@id='NHibernate']/@version";
-
 Setup((context) =>
 {    
     parameters.Initialize(context);
 
     Information("FluentNHibernate");
     Information($"SemVersion: {parameters.Version.SemVersion}");
-    Information($"NHibernateVersion: {parameters.MsBuildShared.NHibernatePackageVersion}");
     Information($"IsLocalBuild: {parameters.IsLocalBuild}");    
     Information($"IsTagged: {parameters.IsTagged}");
     Information($"IsPullRequest: {parameters.IsPullRequest}");
@@ -156,13 +152,11 @@ Task("Zip-Files")
 Task("Create-NuGet-Packages")
     .IsDependentOn("Copy-Files")
     .Does(() =>
-    {                
+    {    
         PackProjects(
             SrcProjects, 
-            parameters.Paths.Directories.NuspecRoot.FullPath, 
-            parameters.Paths.Directories.NugetRoot.FullPath, 
-            parameters.Paths.Directories.ArtifactsBin.FullPath, 
-            parameters.Version.SemVersion);
+            parameters.Configuration,
+            parameters.Paths.Directories.NugetRoot.FullPath);
     });
 
 Task("Publish-Nuget")
@@ -246,21 +240,11 @@ Task("Upload-AppVeyor-Artifacts")
         }
     });
 
-Task("Update-Nuspec-Files")
-    .Does(() =>
-    {                
-        UpdateNuspecs(
-            SrcProjects, 
-            parameters.Paths.Directories.NuspecRoot.FullPath,
-            parameters.MsBuildShared.NHibernatePackageVersion);
-    });
-
 Task("Release-Notes")
   .IsDependentOn("Create-Release-Notes");
 
 Task("Package")
     .IsDependentOn("Zip-Files")
-    .IsDependentOn("Update-Nuspec-Files")
     .IsDependentOn("Create-NuGet-Packages");  
 
 Task("AppVeyor")
@@ -334,66 +318,17 @@ private void PublishProjects(
 
 private void PackProjects(
     IEnumerable<string> projectNames, 
-    string nuspecDir,
-    string nugetDir,
-    string basePath,
-    string semVersion)
+    string configuration,
+    string nugetDir)
 {
-    foreach(var project in projectNames)
-    {
-        // symbols
-        NuGetPack($"{nuspecDir}/{project}.symbols.nuspec", new NuGetPackSettings {
-            Version = semVersion,
-            // ReleaseNotes = releaseNotes.Notes.ToArray(),
-            BasePath = basePath,
-            OutputDirectory = nugetDir,
-            Symbols = true,
-            NoPackageAnalysis = true
-        });
-
-        var fullBasePath = MakeAbsolute((FilePath)basePath).FullPath;
-        var fullBasePathLength = fullBasePath.Length + 1;
-
-        // normal
-        NuGetPack($"{nuspecDir}/{project}.nuspec", new NuGetPackSettings {
-            Version = semVersion,
-            // ReleaseNotes = releaseNotes.Notes.ToArray(),
-            BasePath = fullBasePath,
+    foreach(var project in projectNames) {
+        var projectPath = File($"./src/{project}/{project}.csproj");
+        DotNetCorePack(projectPath.ToString(), new DotNetCorePackSettings
+        {
+            Configuration = configuration,
+            MSBuildSettings = msBuildSettings,
             OutputDirectory = nugetDir,
-            Symbols = false,
-            NoPackageAnalysis = true
-            // Files = GetFiles(fullBasePath + "/**/*")
-            //     .Where(file => file.FullPath.IndexOf("/runtimes/", StringComparison.OrdinalIgnoreCase) < 0)
-            //     .Select(file => file.FullPath.Substring(fullBasePathLength))
-            //     .Select(file => 
-            //         new NuSpecContent 
-            //         { 
-            //             Source = file, 
-            //             Target = file 
-            //         })
-            //     .ToArray()
+            IncludeSymbols = true
         });
     }
-}
-
-private void UpdateNuspecs(
-    IEnumerable<string> projectNames, 
-    string nuspecDir,
-    string nHibernateVersion)
-{
-    foreach(var project in projectNames)
-    {
-        // symbols
-		XmlPoke($"{nuspecDir}/{project}.symbols.nuspec", $"({NHibernateNuspecXPathWithGroup}|{NHibernateNuspecXPath})", nHibernateVersion,
-			new XmlPokeSettings {
-				Namespaces = new Dictionary<string, string> {{ "meta", "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" }}
-			});
-
-        // normal
-		XmlPoke($"{nuspecDir}/{project}.nuspec", $"({NHibernateNuspecXPathWithGroup}|{NHibernateNuspecXPath})", nHibernateVersion,
-			new XmlPokeSettings {
-				Namespaces = new Dictionary<string, string> {{ "meta", "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" }}
-			});
-    }
-}
-
+}
diff --git a/build/parameters.cake b/build/parameters.cake
@@ -1,7 +1,6 @@
 #load "./paths.cake"
 #load "./version.cake"
 #load "./credentials.cake"
-#load "./shared.cake"
 
 public class BuildParameters
 {
@@ -21,7 +20,6 @@ public class BuildParameters
     public BuildNuGet NuGet { get; private set; }            
     public BuildVersion Version { get; private set; }
     public BuildPaths Paths { get; private set; }  
-    public MsBuildShared MsBuildShared { get; private set; }
 
     public bool ShouldPublish =>
         !IsLocalBuild && 
@@ -35,7 +33,6 @@ public class BuildParameters
         Version = BuildVersion.Calculate(context, this);
 
         Paths = BuildPaths.GetPaths(context, Configuration, Version.SemVersion);  
-        MsBuildShared = MsBuildShared.GetShared(context, "./src/Shared.msbuild");
     }
 
     public static BuildParameters GetParameters(ICakeContext context)

diff --git a/build/paths.cake b/build/paths.cake
@@ -27,7 +27,6 @@ public class BuildPaths
         var artifactsBinNetStandard20 = artifactsBinDir.Combine("netstandard2.0");        
         var artifactsBinNetCoreapp2 = artifactsBinDir.Combine("netcoreapp2.0");        
         var testResultsDir = artifactsDir.Combine("test-results");
-        var nuspecRoot = (DirectoryPath)"nuspec";
         var nugetRoot = artifactsDir.Combine("nuget");
 
         var zipArtifactPathDesktop = artifactsDir.CombineWithFilePath($"FluentHibernate-net461-v{semVersion}.zip");        
@@ -36,7 +35,6 @@ public class BuildPaths
         var buildDirectories = new BuildDirectories(
             artifactsDir,
             testResultsDir,
-            nuspecRoot,
             nugetRoot,
             artifactsBinDir,
             artifactsBinFullFx,
@@ -72,7 +70,6 @@ public class BuildDirectories
 {
     public DirectoryPath Artifacts { get; private set; }
     public DirectoryPath TestResults { get; private set; }
-    public DirectoryPath NuspecRoot { get; private set; }
     public DirectoryPath NugetRoot { get; private set; }
     public DirectoryPath ArtifactsBin { get; private set; }
     public DirectoryPath ArtifactsBinFullFx { get; private set; }    
@@ -83,7 +80,6 @@ public class BuildDirectories
     public BuildDirectories(        
         DirectoryPath artifactsDir,
         DirectoryPath testResultsDir,
-        DirectoryPath nuspecRoot,
         DirectoryPath nugetRoot,
         DirectoryPath artifactsBinDir,
         DirectoryPath artifactsBinFullFx,
@@ -93,7 +89,6 @@ public class BuildDirectories
     {
         Artifacts = artifactsDir;
         TestResults = testResultsDir;
-        NuspecRoot = nuspecRoot;
         NugetRoot = nugetRoot;
         ArtifactsBin = artifactsBinDir;
         ArtifactsBinFullFx = artifactsBinFullFx;        

diff --git a/build/shared.cake b/build/shared.cake
diff --git a/build/version.cake b/build/version.cake
@@ -23,8 +23,7 @@ public class BuildVersion
             if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
             {
                 context.GitVersion(new GitVersionSettings{
-                    UpdateAssemblyInfoFilePath = "./src/CommonAssemblyInfo.cs",
-                    UpdateAssemblyInfo = true,
+                    UpdateAssemblyInfo = false,
                     OutputType = GitVersionOutput.BuildServer
                 });
 
@@ -45,14 +44,6 @@ public class BuildVersion
             context.Information("Calculated Semantic Version: {0}", semVersion);
         }
 
-        if (string.IsNullOrEmpty(version) || string.IsNullOrEmpty(semVersion))
-        {
-            context.Information("Fetching version from first CommonAssemblyInfo...");
-            version = ReadCommonAssemblyInfoVersion(context);
-            semVersion = version;
-            milestone = string.Concat("v", version);
-        }
-
         var appVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
 
         return new BuildVersion
@@ -64,14 +55,4 @@ public class BuildVersion
             AppVersion = appVersion
         };
     }
-
-    public static string ReadCommonAssemblyInfoVersion(ICakeContext context)
-    {
-        var solutionInfo = context.ParseAssemblyInfo("./src/CommonAssemblyInfo.cs");
-        if (!string.IsNullOrEmpty(solutionInfo.AssemblyVersion))
-        {
-            return solutionInfo.AssemblyVersion;
-        }
-        throw new CakeException("Could not parse version.");
-    }
 }
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "projects": [ "src" ],
     "sdk": {
-        "version": "2.1.4"
+        "version": "2.1.700"
     }
 }
diff --git a/nuspec/FluentNHibernate.nuspec b/nuspec/FluentNHibernate.nuspec
diff --git a/nuspec/FluentNHibernate.symbols.nuspec b/nuspec/FluentNHibernate.symbols.nuspec
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs