Merge branch 'main' into mu-20241112-issue-1041-camera-mlkit-vision

dotnet · Nov 12, 2024 · eae007b · eae007b
2 parents 7a91101 + 8a6500a
commit eae007b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/ci/variables.yml b/build/ci/variables.yml
@@ -19,7 +19,7 @@ variables:
   macosAgentPoolName: VSEng-VSMac-Xamarin-Shared                                        # macOS VM pool name
 
   # Tool variables
-  dotnetVersion: '8.0.403'                                                              # .NET version to install on agent
+  dotnetVersion: '8.0.404'                                                              # .NET version to install on agent
   dotnetWorkloadRollbackFile: 'workloads.json'                                          # Rollback file specifying workload versions to install
   dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json'                           # NuGet.org URL to find workloads
   dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json'                       # .NET engineering URL to find workloads
@@ -33,6 +33,6 @@ variables:
   extendedTestAssembly: tests/extended/bin/$(configuration)/net8.0/ExtendedTests.dll    # Extended tests compiled binary
 
   # dotnet-next test variables
-  dotnetNextVersion: 9.0.100-rc.2.24474.11                                              # .NET preview version to install
+  dotnetNextVersion: 9.0.100                                                            # .NET preview version to install
   dotnetNextFrameworkVersion: 9                                                         # The number to use for TF (eg: net9.0-android)
   dotnetNextApiLevel: 35                                                                # The Android SDK API Level to use (eg: -android35.0)
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
     "sdk": 
     {
-        "version": "8.0.403",
+        "version": "8.0.404",
         "rollForward": "patch"
     },
     "msbuild-sdks":