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

Merged PR 22879: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20220511.7
- **Date Produced**: May 11, 2022 5:34:05 PM UTC
- **Commit**: e3cbecc5b0e51374e3d71dbb976004ab9cc90430
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1]
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1]

[1]: 5fdd5b6...e3cbecc

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.105

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
This commit is contained in:
DotNet Bot 2022-05-12 20:04:33 +00:00 committed by Matt Mitchell
parent e20e768bfd
commit 3ba5fa5132
4 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NuGet.config
View file

@ -7,9 +7,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e5f183b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e5f183b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@ -42,9 +39,6 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-e5f183b" value="true" />
<add key="darc-int-dotnet-aspnetcore-e5f183b-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-e5f183b-2" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-70ae3df" value="true" />

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22254.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22261.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22254.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22261.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22254.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22261.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5fdd5b6c08c6c39edf12001400a11786c03b3e35</Sha>
<Sha>e3cbecc5b0e51374e3d71dbb976004ab9cc90430</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22262.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.22254.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22261.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.104",
"dotnet": "6.0.105",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7"
}
}