Skip to content

[release/9.0.1xx] Update dependencies from dotnet/sdk #9980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: release/9.0.1xx
Choose a base branch
from
+12 −12
Open

[release/9.0.1xx] Update dependencies from dotnet/sdk #9980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b288777
Update dependencies from https://github.com/dotnet/sdk build 20250327.5
dotnet-maestro[bot] Mar 27, 2025
67d0832
9.0.100 harcoded version band
jonathanpeppers Mar 26, 2025
f28db80
Update dependencies from https://github.com/dotnet/sdk build 20250330.2
dotnet-maestro[bot] Mar 31, 2025
c754dc5
Update dependencies from https://github.com/dotnet/sdk build 20250406.8
dotnet-maestro[bot] Apr 7, 2025
9184b44
Update dependencies from https://github.com/dotnet/sdk build 20250411.10
dotnet-maestro[bot] Apr 14, 2025
0595c55
Update dependencies from https://github.com/dotnet/sdk build 20250417.2
dotnet-maestro[bot] Apr 17, 2025
1d2f494
Update dependencies from https://github.com/dotnet/sdk build 20250420.2
dotnet-maestro[bot] Apr 21, 2025
6008e66
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-700eb15b-cbd…
jonathanpeppers Apr 21, 2025
96f3f9d
dotnet/runtime 8.0.16 feeds
jonathanpeppers Apr 21, 2025
eebf4bc
Update IncrementalBuildTest.cs
jonathanpeppers Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.105-servicing.25164.42">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.300-rtm.25220.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>8d515d2a57e0c45a81795d7b133300fd8944f3f9</Sha>
<Sha>6e5cad9c56247852d106fec2390ed551e2d3a376</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.5-servicing.25211.5">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>9.0.105-servicing.25164.42</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.300-rtm.25220.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.5-servicing.25211.5</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.5</MicrosoftNETCoreAppRefPackageVersion>
Expand All @@ -22,9 +22,9 @@
<VersionSuffixRegex>\-(preview|rc|alpha).\d+</VersionSuffixRegex>
<DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex)))</DotNetPreviewVersionBand>
<DotNetSdkManifestsFolder>$(DotNetPreviewVersionBand)</DotNetSdkManifestsFolder>
<DotNetMonoManifestVersionBand>$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETCoreAppRefPackageVersion), $(VersionSuffixRegex)))</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex)))</DotNetEmscriptenManifestVersionBand>
<!-- NOTE: sometimes we hardcode this when transitioning to new version bands -->
<DotNetAndroidManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetAndroidManifestVersionBand>
<!-- NOTE: sometimes we hardcode these when transitioning to new version bands -->
<DotNetMonoManifestVersionBand>9.0.100</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>9.0.100</DotNetEmscriptenManifestVersionBand>
<DotNetAndroidManifestVersionBand>9.0.100</DotNetAndroidManifestVersionBand>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion external/Java.Interop.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
<Standalone>True</Standalone>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion external/debugger-libs.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion external/monodroid.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ public void MissingProjectReference ()

// Build app before library is built
Assert.IsFalse (appBuilder.Build (app), "app build should have failed.");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project '{reference.Replace ('\\', Path.DirectorySeparatorChar)}' does not exist."));
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project {reference.Replace ('\\', Path.DirectorySeparatorChar)} does not exist."));
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Warning(s)"), "Should receive 1 Warning");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "error CS0246"), "Should receive CS0246");
Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Error(s)"), "Should receive 1 Error");
Expand Down
Loading