Fixes Issue #4705

nunit · May 7, 2024 · c0e3970 · c0e3970
1 parent 4eaab2e
commit c0e3970
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 9 deletions.
diff --git a/build.cake b/build.cake
@@ -116,29 +116,66 @@ Task("NuGetRestore")
         DotNetRestore(SOLUTION_FILE);
     });
 
+//////////////////////////////////////////////////////////////////////
+// Generate AssemblyInfo
+//////////////////////////////////////////////////////////////////////
+
+Task("Generate-AssemblyInfo")
+    .Description("Generates the AssemblyInfo file")
+    .Does(() =>
+    {
+        var version = packageVersion.ToString(); 
+        var assemblyVersion = version.Substring(0, version.LastIndexOf('-')) + ".0";
+    Information("Assembly Version: " + assemblyVersion);
+    Information("Package Version: " + packageVersion);
+
+        
+        var assemblyInfoContents = $@"
+// Generated by Cake
+using System.Reflection;
+
+[assembly: System.Reflection.AssemblyVersion(""{assemblyVersion}"")]
+[assembly: System.Reflection.AssemblyFileVersion(""{assemblyVersion}"")]
+[assembly: System.Reflection.AssemblyInformationalVersion(""{version}"")]
+
+";
+        var filePath = "./src/AssemblyInfo.g.cs";
+        EnsureDirectoryExists("./src");
+        System.IO.File.WriteAllText(filePath, assemblyInfoContents, Encoding.UTF8);
+        Information($"Generated assembly info at {filePath}");
+    });
+
+
+
 //////////////////////////////////////////////////////////////////////
 // BUILD FRAMEWORKS
 //////////////////////////////////////////////////////////////////////
 
 Task("Build")
     .Description("Builds the Solution")
     .IsDependentOn("NuGetRestore")
+    .IsDependentOn("Generate-AssemblyInfo")
     .Does(() =>
     {
         DotNetBuild(SOLUTION_FILE, CreateDotNetBuildSettings());
     });
 
-DotNetBuildSettings CreateDotNetBuildSettings() =>
-    new DotNetBuildSettings
+DotNetBuildSettings CreateDotNetBuildSettings() 
+{
+
+    var msBuildSettings = new DotNetMSBuildSettings {
+        ContinuousIntegrationBuild = BuildSystem.GitHubActions.IsRunningOnGitHubActions
+    };
+
+    var settings =  new DotNetBuildSettings
     {
         Configuration = configuration,
         NoRestore = true,
         Verbosity = DotNetVerbosity.Minimal,
-        MSBuildSettings = new DotNetMSBuildSettings {
-            Version = packageVersion,
-            ContinuousIntegrationBuild = BuildSystem.GitHubActions.IsRunningOnGitHubActions
-        }
+        MSBuildSettings = msBuildSettings
      };
+    return settings;
+}
 
 //////////////////////////////////////////////////////////////////////
 // TEST

diff --git a/src/AssemblyInfo.g.cs b/src/AssemblyInfo.g.cs
@@ -0,0 +1,8 @@
+
+// Generated by Cake
+// using System.Reflection;
+
+[assembly: System.Reflection.AssemblyVersion("4.2.0.0")]
+[assembly: System.Reflection.AssemblyFileVersion("4.2.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersion("4.2.0-alpha.0.17")]
+
diff --git a/src/NUnitFramework/FrameworkVersion.cs b/src/NUnitFramework/FrameworkVersion.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-using System.Reflection;
+//using System.Reflection;
 
 //
 // Current version for the NUnit Framework
 //
-[assembly: AssemblyVersion("4.0.1.0")]
-[assembly: AssemblyFileVersion("4.0.1.0")]
+//[assembly: AssemblyVersion("4.0.1.0")]
+//[assembly: AssemblyFileVersion("4.0.1.0")]
diff --git a/src/NUnitFramework/framework/nunit.framework.csproj b/src/NUnitFramework/framework/nunit.framework.csproj
@@ -6,6 +6,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
+
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Threading.Tasks.Extensions" />
@@ -22,6 +23,10 @@
     <Compile Include="..\FrameworkVersion.cs" Link="Properties\FrameworkVersion.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.g.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Memory" />
   </ItemGroup>

diff --git a/src/NUnitFramework/nunit.framework.legacy/nunit.framework.legacy.csproj b/src/NUnitFramework/nunit.framework.legacy/nunit.framework.legacy.csproj
@@ -14,6 +14,9 @@
   <ItemGroup>
     <ProjectReference Include="..\framework\nunit.framework.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.g.cs" />
+  </ItemGroup>
 
 </Project>
 
diff --git a/src/NUnitFramework/nunitlite/nunitlite.csproj b/src/NUnitFramework/nunitlite/nunitlite.csproj
@@ -14,6 +14,10 @@
     <Compile Include="..\..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
     <Compile Include="..\FrameworkVersion.cs" Link="Properties\FrameworkVersion.cs" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.g.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Include="..\framework\Schemas\*.xsd" LinkBase="Schemas" CopyToOutputDirectory="Always" />

diff --git a/src/src.sln b/src/src.sln
@@ -0,0 +1,110 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitFramework", "NUnitFramework", "{7B5F73E3-C03E-4154-B4F5-1C101D3306AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.framework", "NUnitFramework\framework\nunit.framework.csproj", "{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly", "NUnitFramework\mock-assembly\mock-assembly.csproj", "{873F41EF-D18E-4590-8613-800B1750C753}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.framework.legacy", "NUnitFramework\nunit.framework.legacy\nunit.framework.legacy.csproj", "{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.framework.legacy.tests", "NUnitFramework\nunit.framework.legacy.tests\nunit.framework.legacy.tests.csproj", "{29B37F27-EA04-473E-B46A-764111153F45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunitlite", "NUnitFramework\nunitlite\nunitlite.csproj", "{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunitlite-runner", "NUnitFramework\nunitlite-runner\nunitlite-runner.csproj", "{C623ABB0-5C15-4191-AEB8-47CF121B3A98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunitlite.tests", "NUnitFramework\nunitlite.tests\nunitlite.tests.csproj", "{56A81FD3-EE76-4773-8AEE-588A67213610}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "slow-nunit-tests", "NUnitFramework\slow-tests\slow-nunit-tests.csproj", "{C96DE053-BB4E-4E41-89EE-B71C560326F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.testdata", "NUnitFramework\testdata\nunit.testdata.csproj", "{9C40430E-9CC6-484F-831D-F72A82867513}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.framework.tests", "NUnitFramework\tests\nunit.framework.tests.csproj", "{89B6A384-F0B5-488C-A4BF-64672592F4A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "windows-tests", "NUnitFramework\windows-tests\windows-tests.csproj", "{8EA8704B-7A86-4315-8FF0-C441C473867C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{CB5958A9-616D-4B55-88D1-4B040CFCEF41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.framework.benchmarks", "NUnitFramework\benchmarks\nunit.framework.benchmarks\nunit.framework.benchmarks.csproj", "{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{873F41EF-D18E-4590-8613-800B1750C753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{873F41EF-D18E-4590-8613-800B1750C753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{873F41EF-D18E-4590-8613-800B1750C753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{873F41EF-D18E-4590-8613-800B1750C753}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29B37F27-EA04-473E-B46A-764111153F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B37F27-EA04-473E-B46A-764111153F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29B37F27-EA04-473E-B46A-764111153F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29B37F27-EA04-473E-B46A-764111153F45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C623ABB0-5C15-4191-AEB8-47CF121B3A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C623ABB0-5C15-4191-AEB8-47CF121B3A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C623ABB0-5C15-4191-AEB8-47CF121B3A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C623ABB0-5C15-4191-AEB8-47CF121B3A98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A81FD3-EE76-4773-8AEE-588A67213610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A81FD3-EE76-4773-8AEE-588A67213610}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A81FD3-EE76-4773-8AEE-588A67213610}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A81FD3-EE76-4773-8AEE-588A67213610}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C96DE053-BB4E-4E41-89EE-B71C560326F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C96DE053-BB4E-4E41-89EE-B71C560326F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C96DE053-BB4E-4E41-89EE-B71C560326F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C96DE053-BB4E-4E41-89EE-B71C560326F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C40430E-9CC6-484F-831D-F72A82867513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C40430E-9CC6-484F-831D-F72A82867513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C40430E-9CC6-484F-831D-F72A82867513}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C40430E-9CC6-484F-831D-F72A82867513}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89B6A384-F0B5-488C-A4BF-64672592F4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89B6A384-F0B5-488C-A4BF-64672592F4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89B6A384-F0B5-488C-A4BF-64672592F4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89B6A384-F0B5-488C-A4BF-64672592F4A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EA8704B-7A86-4315-8FF0-C441C473867C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EA8704B-7A86-4315-8FF0-C441C473867C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EA8704B-7A86-4315-8FF0-C441C473867C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EA8704B-7A86-4315-8FF0-C441C473867C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{5CEA3D8B-D503-4B6F-95CC-D2BBC135EED0} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{873F41EF-D18E-4590-8613-800B1750C753} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{A0EE940B-89B6-4DCE-BFED-35DCF62F2DAD} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{29B37F27-EA04-473E-B46A-764111153F45} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{BDD0A978-F27B-41B7-977D-0FA9EF5FD43A} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{C623ABB0-5C15-4191-AEB8-47CF121B3A98} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{56A81FD3-EE76-4773-8AEE-588A67213610} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{C96DE053-BB4E-4E41-89EE-B71C560326F8} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{9C40430E-9CC6-484F-831D-F72A82867513} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{89B6A384-F0B5-488C-A4BF-64672592F4A9} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{8EA8704B-7A86-4315-8FF0-C441C473867C} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{CB5958A9-616D-4B55-88D1-4B040CFCEF41} = {7B5F73E3-C03E-4154-B4F5-1C101D3306AF}
+		{CF7D22F1-A832-47EE-B2FF-A46A85E9FDAA} = {CB5958A9-616D-4B55-88D1-4B040CFCEF41}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {641F6593-9E85-49C2-BC59-90BD7C8DA758}
+	EndGlobalSection
+EndGlobal