Enable .NET 6 Preview Builds (#1745)

JimBobSquarePants · web-flow · commit 36f4ad48f903 · 2021-08-22T21:46:59.000+10:00
Enable Net 6 and C#9
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,19 +1,37 @@
 name: Build
 
 on:
-    push:
-        branches:
-            - master
-        tags:
-            - "v*"
-    pull_request:
-        branches:
-            - master
+   push:
+       branches:
+           - master
+       tags:
+           - "v*"
+   pull_request:
+       branches:
+          - master
 jobs:
     Build:
         strategy:
             matrix:
                 options:
+                    - os: ubuntu-latest
+                      framework: net6.0
+                      sdk: 6.0.x
+                      sdk-preview: true
+                      runtime: -x64
+                      codecov: false
+                    - os: macos-latest
+                      framework: net6.0
+                      sdk: 6.0.x
+                      sdk-preview: true
+                      runtime: -x64
+                      codecov: false
+                    - os: windows-latest
+                      framework: net6.0
+                      sdk: 6.0.x
+                      sdk-preview: true
+                      runtime: -x64
+                      codecov: false
                     - os: ubuntu-latest
                       framework: net5.0
                       runtime: -x64
@@ -52,98 +70,133 @@ jobs:
                       codecov: false
 
         runs-on: ${{matrix.options.os}}
-        if: "!contains(github.event.head_commit.message, '[skip ci]')"
 
         steps:
-            - uses: actions/checkout@v2
+            - name: Git Config
+              shell: bash
+              run: |
+                  git config --global core.autocrlf false
+                  git config --global core.longpaths true
+
+            - name: Git Checkout
+              uses: actions/checkout@v2
+              with:
+                fetch-depth: 0
+                submodules: recursive
             
             # See https://github.com/actions/checkout/issues/165#issuecomment-657673315
-            - name: Create LFS file list
+            - name: Git Create LFS FileList
               run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
 
-            - name: Restore LFS cache
+            - name: Git Setup LFS Cache
               uses: actions/cache@v2
               id: lfs-cache
               with:
                 path: .git/lfs
                 key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
 
-            - name: Git LFS Pull
+            - name: Git Pull LFS
               run: git lfs pull
 
-            - name: Install NuGet
+            - name: NuGet Install
               uses: NuGet/setup-nuget@v1
 
-            - name: Setup Git
-              shell: bash
-              run: |
-                  git config --global core.autocrlf false
-                  git config --global core.longpaths true
-                  git fetch --prune --unshallow
-                  git submodule -q update --init --recursive
-
-            - name: Setup NuGet Cache
+            - name: NuGet Setup Cache
               uses: actions/cache@v2
               id: nuget-cache
               with:
                   path: ~/.nuget
                   key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
                   restore-keys: ${{ runner.os }}-nuget-
 
-            - name: Build
+            - name: DotNet Setup Preview
+              if: ${{ matrix.options.sdk-preview == true }}
+              uses: actions/setup-dotnet@v1
+              with:
+                dotnet-version: ${{ matrix.options.sdk }}
+                include-prerelease: true
+
+            - name: DotNet Build
+              if: ${{ matrix.options.sdk-preview != true }}
               shell: pwsh
               run: ./ci-build.ps1 "${{matrix.options.framework}}"
               env:
                 SIXLABORS_TESTING: True
 
-            - name: Test
+            - name: DotNet Build Preview
+              if: ${{ matrix.options.sdk-preview == true }}
+              shell: pwsh
+              run: ./ci-build.ps1 "${{matrix.options.framework}}"
+              env:
+                SIXLABORS_TESTING_PREVIEW: True
+
+            - name: DotNet Test
+              if: ${{ matrix.options.sdk-preview != true }}
               shell: pwsh
               run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
               env:
-                  SIXLABORS_TESTING: True
-                  XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
+                SIXLABORS_TESTING: True
+                XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
+
+            - name: DotNet Test Preview
+              if: ${{ matrix.options.sdk-preview == true }}
+              shell: pwsh
+              run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
+              env:
+                SIXLABORS_TESTING_PREVIEW: True
+                XUNIT_PATH: .\tests\ImageSharp.Tests # Required for xunit
 
             - name: Export Failed Output
               uses: actions/upload-artifact@v2
               if: failure()
               with:
-                  name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
-                  path: tests/Images/ActualOutput/
+                name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
+                path: tests/Images/ActualOutput/
 
-            - name: Update Codecov
+            - name: Codecov Update
               uses: codecov/codecov-action@v1
               if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
               with:
-                  flags: unittests
+                flags: unittests
 
     Publish:
         needs: [Build]
 
-        runs-on: windows-latest
+        runs-on: ubuntu-latest
 
         if: (github.event_name == 'push')
 
         steps:
-            - uses: actions/checkout@v2
-
-            - name: Install NuGet
-              uses: NuGet/setup-nuget@v1
-
-            - name: Setup Git
+            - name: Git Config
               shell: bash
               run: |
                   git config --global core.autocrlf false
                   git config --global core.longpaths true
-                  git fetch --prune --unshallow
-                  git submodule -q update --init --recursive
 
-            - name: Pack
+            - name: Git Checkout
+              uses: actions/checkout@v2
+              with:
+                fetch-depth: 0
+                submodules: recursive
+
+            - name: NuGet Install
+              uses: NuGet/setup-nuget@v1
+
+            - name: NuGet Setup Cache
+              uses: actions/cache@v2
+              id: nuget-cache
+              with:
+                  path: ~/.nuget
+                  key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
+                  restore-keys: ${{ runner.os }}-nuget-
+
+            - name: DotNet Pack
               shell: pwsh
               run: ./ci-pack.ps1
 
-            - name: Publish to MyGet
+            - name: MyGet Publish
               shell: pwsh
               run: |
-                  nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
-                  nuget.exe push .\artifacts\*.snupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v3/index.json
+                  dotnet nuget push .\artifacts\*.nupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v2/package
+                  dotnet nuget push .\artifacts\*.snupkg -k ${{secrets.MYGET_TOKEN}} -s https://www.myget.org/F/sixlabors/api/v3/index.json
               # TODO: If github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,6 +18,11 @@
   <!-- Import the shared global .props file -->
   <Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
 
+  <PropertyGroup Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+    <!-- Workaround various issues bound to implicit language features. -->
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
   <!--
   Ensure all custom build configurations based upon "Release" are optimized.
   This is easier than setting each project individually.
diff --git a/shared-infrastructure b/shared-infrastructure
@@ -1 +1 @@
-Subproject commit 9b94ebc4be9b7a8d7620c257e6ee485455973332
+Subproject commit f48ab829167c42c69242ed0d303683232fbfccd1
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
@@ -16,6 +16,11 @@
   </PropertyGroup>
 
   <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
+      </PropertyGroup>
+    </When>
     <When Condition="$(SIXLABORS_TESTING) == true">
       <PropertyGroup>
         <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.3;net472</TargetFrameworks>
diff --git a/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationSlidingWindowProcessor{TPixel}.cs b/src/ImageSharp/Processing/Processors/Normalization/AdaptiveHistogramEqualizationSlidingWindowProcessor{TPixel}.cs
@@ -257,7 +257,7 @@ private void CopyPixelRowFast(
         [MethodImpl(InliningOptions.ShortMethod)]
         private void AddPixelsToHistogram(ref Vector4 greyValuesBase, ref int histogramBase, int luminanceLevels, int length)
         {
-            for (int idx = 0; idx < length; idx++)
+            for (nint idx = 0; idx < length; idx++)
             {
                 int luminance = ColorNumerics.GetBT709Luminance(ref Unsafe.Add(ref greyValuesBase, idx), luminanceLevels);
                 Unsafe.Add(ref histogramBase, luminance)++;
diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@@ -9,12 +9,16 @@
     <!--Used to hide test project from dotnet test-->
     <IsTestProject>false</IsTestProject>
     <Configurations>Debug;Release;Debug-InnerLoop;Release-InnerLoop</Configurations>
-    <LangVersion>9</LangVersion>
     <!-- Uncomment this to run benchmarks depending on Colorful or Pfim (colorspaces and TGA): -->
     <!--<SignAssembly>false</SignAssembly>-->
   </PropertyGroup>
 
   <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+      </PropertyGroup>
+    </When>
     <When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
       <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
@@ -14,10 +14,14 @@
     <EnsureNETCoreAppRuntime>false</EnsureNETCoreAppRuntime>
     <Configurations>Debug;Release;Debug-InnerLoop;Release-InnerLoop</Configurations>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
-    <LangVersion>9</LangVersion>
   </PropertyGroup>
 
   <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+      </PropertyGroup>
+    </When>
     <When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
       <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -10,6 +10,11 @@
   </PropertyGroup>
 
   <Choose>
+    <When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
+      <PropertyGroup>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netcoreapp2.1;net472</TargetFrameworks>
+      </PropertyGroup>
+    </When>
     <When Condition="$(Configuration.EndsWith('InnerLoop')) == true">
       <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
@@ -21,7 +26,7 @@
       </PropertyGroup>
     </Otherwise>
   </Choose>
-  
+
   <ItemGroup>
     <InternalsVisibleTo Include="ImageSharp.Tests.ProfilingSandbox" Key="$(SixLaborsPublicKey)" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ private void CopyPixelRowFast(`
`257`	`257`	`[MethodImpl(InliningOptions.ShortMethod)]`
`258`	`258`	`private void AddPixelsToHistogram(ref Vector4 greyValuesBase, ref int histogramBase, int luminanceLevels, int length)`
`259`	`259`	`{`
`260`		`- for (int idx = 0; idx < length; idx++)`
	`260`	`+ for (nint idx = 0; idx < length; idx++)`
`261`	`261`	`{`
`262`	`262`	`int luminance = ColorNumerics.GetBT709Luminance(ref Unsafe.Add(ref greyValuesBase, idx), luminanceLevels);`
`263`	`263`	`Unsafe.Add(ref histogramBase, luminance)++;`