Skip to content

[release/8.0.1xx] Update dependencies from dotnet/installer #8365

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

Merged
jonathanpeppers merged 16 commits into from
Sep 26, 2023
Merged

[release/8.0.1xx] Update dependencies from dotnet/installer #8365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9364cb5
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 22, 2023
d7da306
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 23, 2023
bd3c0b5
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 24, 2023
9fbef6a
dotnet/runtime 7.0.12
jonathanpeppers Sep 22, 2023
d700b7f
dotnet/runtime 6.0.23
jonathanpeppers Sep 22, 2023
bf4f32a
Pass `-p:RestoreConfigFile` to `Java.Interop.sln`
jonathanpeppers Sep 22, 2023
cba5bc5
Bump to xamarin/monodroid/main@6c16fb50
jonathanpeppers Sep 25, 2023
436f823
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 25, 2023
51ba059
Mono/emsdk version bands are 8.0.100-rtm
jonathanpeppers Sep 25, 2023
61cf5db
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 26, 2023
d52c6f8
Revert "Pass `-p:RestoreConfigFile` to `Java.Interop.sln`"
jonathanpeppers Sep 26, 2023
eba2d19
Revert "dotnet/runtime 6.0.23"
jonathanpeppers Sep 26, 2023
e8a2337
Revert "dotnet/runtime 7.0.12"
jonathanpeppers Sep 26, 2023
ae62307
Revert "Bump to xamarin/monodroid/main@6c16fb50"
jonathanpeppers Sep 26, 2023
cf218f1
Revert "Revert "dotnet/runtime 7.0.12""
jonathanpeppers Sep 26, 2023
c3bcf40
Revert "Revert "dotnet/runtime 6.0.23""
jonathanpeppers Sep 26, 2023
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
8 changes: 5 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
<!-- 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 7.0.11 -->
<add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-0ece505" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0ece5051/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.12 -->
<add key="darc-pub-dotnet-emsdk-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-26e0f82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.23 -->
<add key="darc-pub-dotnet-runtime-301ba1e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23468.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rtm.23475.14">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e1fd7d964980ed478fa30457cf750e81105caee1</Sha>
<Sha>2ff90f1abc52c3fc02812bad157e2985040a77a1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rtm.23472.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
<Sha>e95228dbcf7a69f87b00da969b0cabf2e62ab207</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rtm.23472.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>287c10d2539d47268a1083c4d533cf84124900cf</Sha>
<Sha>e95228dbcf7a69f87b00da969b0cabf2e62ab207</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.2.23463.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rtm.23470.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc</Sha>
<Sha>446eeb331fcbf2f48c14a377601a8ab950ec942e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23461.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23468.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>a112f15aa032c029b7d9c77df3427111d93cf407</Sha>
<Sha>89be445dd4936157533ad96bafb95f701430653a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23468.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23475.14</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rtm.23472.12</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rtm.23472.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.2.23463.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23470.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23461.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23468.2</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -18,8 +18,8 @@
<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>
<DotNetMonoManifestVersionBand>8.0.100-rtm</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>8.0.100-rtm</DotNetEmscriptenManifestVersionBand>
<!-- NOTE: sometimes we hardcode this when transitioning to new version bands -->
<DotNetAndroidManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetAndroidManifestVersionBand>
</PropertyGroup>
Expand Down