Net6 support (#538)

approvals · May 27, 2021 · 2855145 · 2855145
1 parent 17cce6e
commit 2855145
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 # Auto detect text files and perform LF normalization
 * text eol=crlf
+*.json -text
 
 # Custom for Visual Studio
 *.cs     diff=csharp

diff --git a/src/ApprovalTests.MSTest/ApprovalTests.MSTest.csproj b/src/ApprovalTests.MSTest/ApprovalTests.MSTest.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all" />

diff --git a/src/ApprovalTests.Tests/ApprovalTests.Tests.csproj b/src/ApprovalTests.Tests/ApprovalTests.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all" />

diff --git a/src/ApprovalTests.Tests/Email/EmailTest.cs b/src/ApprovalTests.Tests/Email/EmailTest.cs
@@ -28,6 +28,7 @@ public void Testname()
             }
         }
 
+        #if(NET48)
         [Test]
         public void TestAttachment()
         {
@@ -43,13 +44,13 @@ public void TestAttachment()
                 EmailApprovals.Verify(message);
             }
         }
+        #endif
 
         [Test]
         public void TestCollectBoundaries()
         {
             var text = @"Content-Type: multipart/mixed; boundary=--boundary_1_f3c617c1-4388-492c-8e07-0ef9bdb8af93
 
-
 ----boundary_1_f3c617c1-4388-492c-8e07-0ef9bdb8af93
 Content-Type: multipart/alternative; boundary=--boundary_0_283b02d8-4af3-4d14-83bd-6d7181499f83
 

diff --git a/src/ApprovalTests.Tests/RunMaintenance.cs b/src/ApprovalTests.Tests/RunMaintenance.cs
@@ -3,6 +3,7 @@
 
 namespace ApprovalTests.Tests
 {
+    #if(NET48)
     [TestFixture]
     public class RunMaintenance
     {
@@ -23,4 +24,5 @@ public void EnsureNoAbandonedFiles()
                 );
         }
     }
+    #endif
 }
diff --git a/src/ApprovalTests.Xunit2/ApprovalTests.Xunit2.csproj b/src/ApprovalTests.Xunit2/ApprovalTests.Xunit2.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all" />

diff --git a/src/ApprovalUtilities.Tests/ApprovalUtilities.Tests.csproj b/src/ApprovalUtilities.Tests/ApprovalUtilities.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all" />
@@ -11,9 +11,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <ProjectReference Include="..\ApprovalTests\ApprovalTests.csproj" />
     <ProjectReference Include="..\ApprovalUtilities\ApprovalUtilities.csproj" />
-    <Reference Include="System.Windows.Forms" />
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework) == 'net48'">
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework) != 'net48'">
     <Compile Remove="Reflection\*.*" />
   </ItemGroup>

diff --git a/src/AssembliesExistInBin/AssembliesExistInBin.csproj b/src/AssembliesExistInBin/AssembliesExistInBin.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6</TargetFrameworks>
     <!-- no CopyLocalLockFileAssemblies=false. So approvalTests.dll is resolved from bin dir -->
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/AssembliesExistInNuget/AssembliesExistInNuget.csproj b/src/AssembliesExistInNuget/AssembliesExistInNuget.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6</TargetFrameworks>
     <!-- do not copy reference assemblies to bin. So approvalTests.dll is resolved from nuget cache dir -->
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
   </PropertyGroup>

diff --git a/src/appveyor.yml b/src/appveyor.yml
@@ -1,10 +1,25 @@
-image: Visual Studio 2019
+image:
+- Visual Studio 2019
+#- macOS
+#- Ubuntu
 build_script:
-- ps: >-
-    dotnet build src\ApprovalUtilities\ApprovalUtilities.csproj --configuration Debug
-
-    dotnet build src\ApprovalTests\ApprovalTests.csproj --configuration Debug
-
-    dotnet build src --configuration Debug
+# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
+- pwsh: |
+    if ($isWindows) {
+      Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./dotnet-install.ps1"
+      ./dotnet-install.ps1 -JSonFile src/global.json -Architecture x64 -InstallDir 'C:\Program Files\dotnet'
+    }
+    else {
+      Invoke-WebRequest "https://dot.net/v1/dotnet-install.sh" -OutFile "./dotnet-install.sh"
+      sudo chmod u+x dotnet-install.sh
+      if ($isMacOS) {
+        sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64  --install-dir '/usr/local/share/dotnet'
+      } else {
+        sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64  --install-dir '/usr/share/dotnet'
+      }
+    }
+- dotnet build src --configuration Debug
+- dotnet test src --configuration Debug --no-build --no-restore
+test: off
 artifacts:
   - path: nuget_packages\*.nupkg
diff --git a/src/global.json b/src/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0.100-preview.4.21255.9",
+    "allowPrerelease": true,
+    "rollForward": "latestFeature"
+  }
+}