mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' of https://github.com/dotnet/installer into darc-main-817315bd-ca8d-4e8e-9a2e-b14bfc73bc22

Browse source
This commit is contained in:
Jason Zhai 2023-05-11 01:02:29 -07:00
commit 9914aa48f5
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -193,18 +193,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23259.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23259.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</Sha>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23259.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23259.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</Sha>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23259.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23259.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>833d08dde7eca1590731085b73245a81de96bd10</Sha>
<Sha>08f0d9daf5c5a422b5a22db601ee9fde7068c7ff</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23226.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23258.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23259.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>c896aec98150aae68c90b0579a24babc864ceb88</Sha>
<Sha>3e23b3bb8fb547e2431e80c6f510146d09aaae84</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23259.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23259.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23259.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23259.5",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23259.5"
}
}

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -364,7 +364,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
<NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
<MicrosoftNetFrameworkCompilersToolsetPackageVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetFrameworkCompilersToolsetPackageVersion>
<_NetFrameworkHostedCompilersVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</_NetFrameworkHostedCompilersVersion>
<NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
<BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
<BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>