Merge pull request #127 from leancodepl/net6-binary

Allow building .NET 7 projects with .NET 6 binary
leancodepl · Dec 12, 2022 · bbec17c · bbec17c
2 parents 2984222 + 5702c6f
commit bbec17c
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
         env:
           BUILD_VERSION: ${{ steps.get_version.outputs.version }}
         working-directory: src/LeanCode.ContractsGenerator
-        run: dotnet publish --output ./publish --no-self-contained --no-build --configuration Release
+        run: dotnet publish --output ./publish --no-self-contained --no-build --configuration Release --framework net6.0
       - name: Pack
         env:
           BUILD_VERSION: ${{ steps.get_version.outputs.version }}

diff --git a/examples/project/aggregated/A/A.csproj b/examples/project/aggregated/A/A.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/project/aggregated/B/B.csproj b/examples/project/aggregated/B/B.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/project/aggregated/Combined/Combined.csproj b/examples/project/aggregated/Combined/Combined.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/project/embedded/embedded.csproj b/examples/project/embedded/embedded.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/project/implicitusings/implicitusings.csproj b/examples/project/implicitusings/implicitusings.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/examples/project/packagereference/packagereference.csproj b/examples/project/packagereference/packagereference.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/project/referencetoembedded/referencetoembedded.csproj b/examples/project/referencetoembedded/referencetoembedded.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <Target Name="BuildDependencies" BeforeTargets="Restore">

diff --git a/examples/project/single/single.csproj b/examples/project/single/single.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/LeanCode.ContractsGenerator/Compilation/MSBuild/MSBuildHelper.cs b/src/LeanCode.ContractsGenerator/Compilation/MSBuild/MSBuildHelper.cs
@@ -14,14 +14,6 @@ namespace LeanCode.ContractsGenerator.Compilation.MSBuild;
 
 public static class MSBuildHelper
 {
-    private const string FrameworkMoniker =
-#if NET6_0
-    "net6.0";
-#elif NET7_0
-    "net7.0";
-#else
-#error TargetFramework property mismatch between project and code.
-#endif
     private static readonly string[] RestoreTarget = new string[] { "Restore" };
 
     private static readonly ImmutableDictionary<string, string> GlobalProperties = ImmutableDictionary.CreateRange(new Dictionary<string, string>
@@ -33,9 +25,6 @@ public static class MSBuildHelper
 
         // Use the preview language version to force the full set of available analyzers to run on the project.
         ["LangVersion"] = "preview",
-
-        ["TargetFrameworks"] = FrameworkMoniker,
-        ["TargetFramework"] = FrameworkMoniker,
     });
 
     static MSBuildHelper()
@@ -100,7 +89,6 @@ public static int RestoreProjects(
 
                 if (!projectInstance.Targets.ContainsKey("_IsProjectRestoreSupported"))
                 {
-                    System.Console.WriteLine("No _IsProjectRestoreSupported");
                     continue;
                 }