Merge branch 'main' into mu-20240211-improvements-data-acquisition-bu…

…ild-timings-measurements
dotnet · Nov 12, 2024 · e15e3d7 · e15e3d7
2 parents e1e93c7 + 8a6500a
commit e15e3d7
Show file tree

Hide file tree

Showing 5 changed files with 642 additions and 642 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -69,7 +69,7 @@
     <Owners>Microsoft</Owners>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageProjectUrl>https://aka.ms/androidx</PackageProjectUrl>
+    <PackageProjectUrl>https://aka.ms/android-libraries</PackageProjectUrl>
     <PackageReadmeFile Condition="Exists('$(MSBuildProjectDirectory)/readme.md')">readme.md</PackageReadmeFile>
 
     <!-- Exclude TF-specific transform files by default -->

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)