Skip to content

[main] Update dependencies from dotnet/installer #6567

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 6 commits into from
Dec 16, 2021
Merged

[main] Update dependencies from dotnet/installer #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f99a061
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Dec 14, 2021
ea35bee
Don't hardcode 6.0.100
jonathanpeppers Dec 14, 2021
0ce619b
Temporarily use Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100
jonathanpeppers Dec 14, 2021
7072bbc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Dec 15, 2021
b88e9dc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Dec 16, 2021
585b3f7
Merge branch 'main' into darc-main-37b068e9-ccb5-4f69-9ed5-981954814173
jonathanpeppers Dec 16, 2021
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
3 changes: 2 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ public static partial class Paths

public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
XAPackagesDir,
$"microsoft.net.workload.mono.toolchain.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetPreviewVersionBand)}",
//TODO: use $(DotNetPreviewVersionBand) after we get: https://github.com/dotnet/runtime/pull/62787
$"microsoft.net.workload.mono.toolchain.manifest-6.0.100",
ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion)
);

Expand Down
3 changes: 2 additions & 1 deletion build-tools/xaprepare/xaprepare/package-download.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetPreviewVersionBand)" Version="[$(DotNetRuntimePacksVersion)]" />
<!-- TODO: use $(DotNetPreviewVersionBand) after we get: https://github.com/dotnet/runtime/pull/62787 -->
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100" Version="[$(DotNetRuntimePacksVersion)]" />
</ItemGroup>

</Project>
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.Dotnet.Sdk.Internal" Version="6.0.102-servicing.21609.9">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-preview.21615.3">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>65bbb444f839ba116ca561390aa8725d0d198130</Sha>
<Sha>2dc0c5a0c9e30b861916e288676dc81d09ec9454</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
Expand Down
6 changes: 2 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.102-servicing.21609.9</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-preview.21615.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21519.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.1-mauipre.1.21602.7</MicrosoftNETCoreAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- NOTE: temporarily hardcode 6.0.100, until we have new branding on dotnet/runtime packs -->
<DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">6.0.100</DotNetPreviewVersionBand>
<!-- Trim all characters after first `-` or `+` is encountered. -->
<!-- <DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, ""))</DotNetPreviewVersionBand> -->
<DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, ""))</DotNetPreviewVersionBand>
</PropertyGroup>
</Project>