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

Merge pull request #13541 from dotnet/darc-release/6.0.2xx-c0c92c7e-f0b4-4599-a20f-14b3a35cd9fa

Browse source 
[release/6.0.2xx] Update dependencies from dotnet/arcade
This commit is contained in:
v-wuzhai 2022-04-05 19:04:57 -07:00 committed by GitHub
commit 46d1044dcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -201,19 +201,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22178.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22178.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22178.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>f8c0d51185208227e582f76ac3c5003db237b689</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22179.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22178.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
eng/common/templates/steps/source-build.yml
View file

@ -43,8 +43,8 @@ steps:
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
fi
buildConfig=Release

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22178.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22178.5"
}
}