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

Merge pull request #13140 from dotnet/darc-main-d2c5b9d3-9e12-43f8-bb4a-785f66934b2e

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Marc Paine 2022-02-02 14:42:15 -08:00 • committed by GitHub
commit e46f36e4b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -177,19 +177,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22076.9">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22076.9">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22076.9">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22070.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@ -201,9 +201,9 @@
<Sha>192fa29996b63bd32b0b112e7757e2ca1c2bfbbb</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22075.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22079.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>91bcb257dfae52bdea37186c40ca6c28382de05b</Sha>
<Sha>8cd0d0d64b445a1db3307d11932006035a47e338</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22076.9</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

2
eng/common/internal/NuGet.config
View file

@ -2,6 +2,6 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
</packageSources>
</configuration>

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22076.9"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22080.1"
}
}