[Infra] Add Net70

.github/workflows/continuous.yml

@@ -25,31 +25,16 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup .NET 2.2
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 2.2.*
-
-      - name: Setup .NET 3.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.0.*
-
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.*
-
-      - name: Setup .NET 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.*
-
-      - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
-          include-prerelease: true
+      - name: Setup .NET version
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            2.2.*
+            3.0.*
+            3.1.*
+            5.0.*
+            6.0.*
+            7.0.*
 
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2

.github/workflows/continuousCore.yml

@@ -25,31 +25,16 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup .NET 2.2
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET version
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 2.2.*
-
-      - name: Setup .NET 3.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.0.*
-
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.*
-
-      - name: Setup .NET 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.*
-
-      - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.*
-          include-prerelease: true
+          dotnet-version: |
+            2.2.*
+            3.0.*
+            3.1.*
+            5.0.*
+            6.0.*
+            7.0.*
 
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2
@@ -68,35 +53,20 @@ jobs:
           path: .result/test-results
   macOS-latest:
     name: macOS-latest
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
 
-      - name: Setup .NET 2.2
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 2.2.*
-
-      - name: Setup .NET 3.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.0.*
-
-      - name: Setup .NET 3.1
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.*
-
-      - name: Setup .NET 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.*
-
-      - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET version
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.*
-          include-prerelease: true
+          dotnet-version: |
+            2.2.*
+            3.0.*
+            3.1.*
+            5.0.*
+            6.0.*
+            7.0.*
 
       - name: Cache .nuke/temp, ~/.nuget/packages
         uses: actions/cache@v2

Build/Nuke/ProjectExtensions.cs

@@ -11,7 +11,13 @@ public static IReadOnlyCollection<string> GetTargetFrameworks(this Project proje
         var frameworks = project.GetTargetFrameworks();
         if (!excludeNetFramework)
             return frameworks.ToList();
-        return frameworks.Where(x => x.Contains("standard") || x.Contains("core") || x.Contains("net50")  || x.Contains("net60")).ToList();
+        return frameworks.Where(x => 
+        x.Contains("standard") ||
+        x.Contains("core") || 
+        x.Contains("net50") || 
+        x.Contains("net60") ||
+        x.Contains("net70")
+        ).ToList();
     }
 
     public static IReadOnlyCollection<string> GetPlatforms(this Project project)
@@ -50,7 +56,7 @@ public static IReadOnlyCollection<string> GetPlatformsForTests(this Project proj
             if (azurePipelines != null && x.framework.Contains("2.2"))
                 return false;
 
-            //exclude netcore 2.1, 2.2, 6.0 in x86 because is not well handle by azure pipelines and github actions on windows
+            //exclude netcore 2.1, 2.2, 5.0, 7.0 in x86 because is not well handle by azure pipelines and github actions on windows
             if (x.platform != "x86")
                 return true;
             if (x.framework == null)
@@ -59,7 +65,9 @@ public static IReadOnlyCollection<string> GetPlatformsForTests(this Project proj
                 return false;
             if (x.framework.Contains("2.2"))
                 return false;
-            if (x.framework.Contains("60"))
+            if (x.framework.Contains("50"))
+                return false;
+            if (x.framework.Contains("70"))
                 return false;
             return true;
         });

azure-pipelines.yml

@@ -15,11 +15,11 @@
 # ------------------------------------------------------------------------------
 
 stages:
-  - stage: windows_latest
-    displayName: 'windows-latest'
+  - stage: windows_2019
+    displayName: 'windows-2019'
     dependsOn: [  ]
     pool:
-      vmImage: 'windows-latest'
+      vmImage: 'windows-2019'
     jobs:
       - job: Compile
         displayName: '⚙️ Compile'
@@ -36,7 +36,12 @@ stages:
             inputs:
               packageType: sdk
               version: 6.0.x
-              includePreviewVersions: true
+              performMultiLevelLookup: true 
+          - task: UseDotNet@2
+            displayName: 'Setup .NET 7.0'
+            inputs:
+              packageType: sdk
+              version: 7.0.x
               performMultiLevelLookup: true 
           - task: CmdLine@2
             inputs:
@@ -82,7 +87,12 @@ stages:
             inputs:
               packageType: sdk
               version: 6.0.x
-              includePreviewVersions: true
+              performMultiLevelLookup: true 
+          - task: UseDotNet@2
+            displayName: 'Setup .NET 7.0'
+            inputs:
+              packageType: sdk
+              version: 7.0.x
               performMultiLevelLookup: true 
           - task: CmdLine@2
             inputs:
@@ -106,7 +116,12 @@ stages:
             inputs:
               packageType: sdk
               version: 6.0.x
-              includePreviewVersions: true
+              performMultiLevelLookup: true 
+          - task: UseDotNet@2
+            displayName: 'Setup .NET 7.0'
+            inputs:
+              packageType: sdk
+              version: 7.0.x
               performMultiLevelLookup: true 
           - task: CmdLine@2
             inputs:

src/Directory.Build.props

@@ -7,7 +7,7 @@
   <!-- common tests properties -->
   <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('Tests'))">
     <IsPackable>False</IsPackable>
-    <DefaultTargetFrameworks>net60;net50;net48</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks>net70;net60;net48</DefaultTargetFrameworks>
   </PropertyGroup>
 
     <ItemGroup Condition="$(MSBuildProjectName.EndsWith('Tests'))">
@@ -26,7 +26,7 @@
   <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('Benchmark'))">
     <IsPackable>False</IsPackable>
     <OutputType>Exe</OutputType>
-    <DefaultTargetFrameworks>net50;net48;net60</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks>net70;net60;net48</DefaultTargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.EndsWith('Benchmark'))">

src/StructLinq.BCL.Tests/StructLinq.BCL.x64.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60</TargetFrameworks>
+    <TargetFrameworks>net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60;net70</TargetFrameworks>
     <Platform>x64</Platform>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>x64</Platforms>

src/StructLinq.BCL.Tests/StructLinq.BCL.x86.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60</TargetFrameworks>
+    <TargetFrameworks>net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60;net70</TargetFrameworks>
     <Platform>x86</Platform>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>x86</Platforms>

src/StructLinq/StructLinq.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net452;net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net452;net472;net48;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50;net60;net70</TargetFrameworks>
 	<OldVersion>True</OldVersion>
 	<OldVersion Condition="'$(TargetFramework)' == 'netstandard1.1' Or '$(TargetFramework)' == 'net452'">true</OldVersion>
   </PropertyGroup>
@@ -144,3 +144,4 @@
   </ItemGroup>
 
 </Project>
+