Update workflows

sungaila · Oct 11, 2024 · 9df8dd3 · 9df8dd3
1 parent f21ce22
commit 9df8dd3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -145,19 +145,19 @@ jobs:
             9.x
           dotnet-quality: 'preview'
       - name: Download test project MonoConsole
-        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04 '|| matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
+        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
         uses: actions/download-artifact@main
         with:
           name: MonoConsole
           path: MonoConsole
       - name: Mono (.NET Framework 4.6.2)
-        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04 '|| matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
+        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
         run: mono MonoConsole/net462/PDFtoImage.FrameworkTests.MonoConsole.exe
       - name: Mono (.NET Framework 4.7.1)
-        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04 '|| matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
+        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
         run: mono MonoConsole/net471/PDFtoImage.FrameworkTests.MonoConsole.exe
       - name: Mono (.NET Framework 4.8.1)
-        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04 '|| matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
+        if: (matrix.os == 'windows-2019' || matrix.os == 'windows-2022' || matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-12' || matrix.os == 'macos-13' || matrix.os == 'macos-14') && (success() || failure())
         run: mono MonoConsole/net481/PDFtoImage.FrameworkTests.MonoConsole.exe
       - name: Download test assemblies
         if: (success() || failure())

diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile
@@ -20,13 +20,21 @@ SHELL ["cmd", "/S", "/C"]
 RUN powershell -c "Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe"
 RUN (start /w vs_buildtools.exe --wait --norestart --nocache \
         --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" \
-        --add Microsoft.VisualStudio.Workload.VCTools \
+        --add Microsoft.VisualStudio.Component.Roslyn.Compiler \
+        --add Microsoft.Component.MSBuild \
+        --add Microsoft.VisualStudio.Component.CoreBuildTools \
+        --add Microsoft.VisualStudio.Workload.MSBuildTools \
+        --add Microsoft.VisualStudio.Component.Windows10SDK \
+        --add Microsoft.VisualStudio.Component.VC.CoreBuildTools \
         --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
+        --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest \
         --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.10240 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.10586 \
-        --remove Microsoft.VisualStudio.Component.Windows10SDK.14393 \
-        --remove Microsoft.VisualStudio.Component.Windows81SDK \
+        --add Microsoft.VisualStudio.Component.TextTemplating \
+        --add Microsoft.VisualStudio.Component.VC.CoreIde \
+        --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
+        --add Microsoft.VisualStudio.Workload.VCTools \
+        --add Microsoft.Component.MSBuild \
+        --add Microsoft.VisualStudio.Workload.VCTools \
         || IF "%ERRORLEVEL%"=="3010" EXIT 0) \
     && del /q vs_buildtools.exe
 

diff --git a/src/FrameworkTests/MauiApp/MauiApp.csproj b/src/FrameworkTests/MauiApp/MauiApp.csproj
@@ -50,9 +50,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0-rc.1.24453.9" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0-rc.1.24453.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.2.24473.5" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0-rc.2.24503.2" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.0-rc.2.24503.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -44,7 +44,7 @@
   <!-- NuGet Icon -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
   </ItemGroup>
 </Project>
diff --git a/src/WebConverter/WebConverter.csproj b/src/WebConverter/WebConverter.csproj
@@ -42,8 +42,8 @@
   <ItemGroup>
     <PackageReference Include="ByteSize" Version="2.1.2" />
     <PackageReference Include="Markdig.Signed" Version="0.37.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.1.24452.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.1.24452.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-rc.2.24474.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0-rc.2.24474.3" PrivateAssets="all" />
     <PackageReference Include="Thinktecture.Blazor.FileHandling" Version="2.0.0" />
     <PackageReference Include="Thinktecture.Blazor.WebShare" Version="2.0.0" />
   </ItemGroup>