Updates to test workflow

codebude · Apr 27, 2024 · 0fb3cbb · 0fb3cbb
1 parent d0354be
commit 0fb3cbb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/wf-build-test.yml b/.github/workflows/wf-build-test.yml
@@ -20,19 +20,13 @@ jobs:
           1.0.x
           2.0.x
           5.0.x
-          6.0.x 
-
-    - name: Setup MSBuild Path
-      uses: microsoft/setup-msbuild@v1      
-
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v2
-
+          6.0.x
+          
     - name: Restore NuGet Packages
-      run: nuget restore QRCoder.sln
+      run: dotnet restore
 
     - name: Build library
-      run: msbuild QRCoder.sln /p:Configuration=Release /p:NoWarn="1182" /p:NoWarn="1701" /nr:false /t:Rebuild
+      run: dotnet build -c Release msbuild QRCoder.sln /p:Configuration=Release /p:NoWarn="1182" /p:NoWarn="1701" /nr:false /t:Rebuild
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4

diff --git a/QRCoderApiTests/QRCoderApiTests.csproj b/QRCoderApiTests/QRCoderApiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>

diff --git a/QRCoderApiTests/net60-windows/QRCoder.approved.txt b/QRCoderApiTests/net60-windows/QRCoder.approved.txt
@@ -76,7 +76,9 @@ namespace QRCoder
         public string GetGraphic(int pixelsPerModule, System.Drawing.Color darkColor, System.Drawing.Color lightColor, System.Drawing.Bitmap icon, int iconSizePercent = 15, int iconBorderWidth = 6, bool drawQuietZones = true, QRCoder.Base64QRCode.ImageType imgType = 2) { }
         public enum ImageType
         {
+            [System.Runtime.Versioning.SupportedOSPlatform("windows")]
             Gif = 0,
+            [System.Runtime.Versioning.SupportedOSPlatform("windows")]
             Jpeg = 1,
             Png = 2,
         }

diff --git a/QRCoderApiTests/net60/QRCoder.approved.txt b/QRCoderApiTests/net60/QRCoder.approved.txt
@@ -34,7 +34,9 @@ namespace QRCoder
         public string GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string lightColorHtmlHex, bool drawQuietZones = true, QRCoder.Base64QRCode.ImageType imgType = 2) { }
         public enum ImageType
         {
+            [System.Runtime.Versioning.SupportedOSPlatform("windows")]
             Gif = 0,
+            [System.Runtime.Versioning.SupportedOSPlatform("windows")]
             Jpeg = 1,
             Png = 2,
         }

diff --git a/QRCoderTests/QRCoderTests.csproj b/QRCoderTests/QRCoderTests.csproj
@@ -9,6 +9,7 @@
 		<IsTestProject>true</IsTestProject>
 		<CheckEolTargetFramework>false</CheckEolTargetFramework>
 		<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+		<NoWarn>$(NoWarn);NU1903</NoWarn>
 	</PropertyGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net6.0-windows' ">
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />