Skip to content

[release/10.0.1xx-preview5] Update dependencies from dotnet/dotnet #10153

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.

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

Closed
Changes from all commits
Commits
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 NuGet.config
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.5 -->
<!-- Added manually for dotnet/runtime 9.0.6 -->
<add key="darc-pub-dotnet-emsdk-3cddc1f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3cddc1fe/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-207cda3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-207cda34/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-df01702" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-df017025/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.16 -->
<add key="darc-pub-dotnet-runtime-6cd8ef8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json" />
</packageSources>
14 changes: 14 additions & 0 deletions build-tools/create-packs/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -87,6 +87,20 @@
<Move SourceFiles="@(_WLExtractedFiles)" DestinationFolder="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\" />
<RemoveDir Directories="$(_SdkManifestsFolder)temp\" />

<!-- Patch 8.0.17 runtime -->
<PropertyGroup>
<_MonoManifestFolder>$(_SdkManifestsFolder)microsoft.net.workload.mono.toolchain.net8\$(MicrosoftNETSdkPackageVersion)\</_MonoManifestFolder>
</PropertyGroup>
<ReplaceFileContents
SourceFile="$(_MonoManifestFolder)WorkloadManifest.json"
DestinationFile="$(_MonoManifestFolder)WorkloadManifest.new.json"
Replacements="8.0.17=8.0.16"
/>
<Copy
SourceFiles="$(_MonoManifestFolder)WorkloadManifest.new.json"
DestinationFiles="$(_MonoManifestFolder)WorkloadManifest.json"
/>

<!-- Parse NuGet.config -->
<XmlPeek
XmlInputPath="$(XamarinAndroidSourcePath)NuGet.config"
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.5.25267.102">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.5.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.5.25267.102">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.5.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25267.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.5.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25267.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
<!-- Previous .NET Android version(s) -->
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.61">
@@ -27,13 +27,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25267.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-preview.5.25267.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-preview.5.25280.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>170498a9429a5553fe7ac0ec2341d19bbb97cbe8</Sha>
<Sha>992d87b8b8e43f06040a52e6a949d12916879014</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.5.25267.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.5.25280.105</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25267.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.5.25280.105</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.5.25280.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25267.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25280.105</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.5.25267.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25267.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.5.25280.105</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25280.105</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
Loading