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

Merge in 'release/6.0.4xx' changes

Browse source
This commit is contained in:
dotnet-bot 2023-04-12 17:20:53 +00:00
commit 1cf9af3c65
4 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
NuGet.config
View file

@ -7,7 +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-d6f154c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d6f154cc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
@ -15,12 +14,18 @@
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-1e620a4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1e620a4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1e620a4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-1450763" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1450763a/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-1450763-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1450763a-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-1450763-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1450763a-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-bde268e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-bde268e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-bde268e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-bde268e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-bde268e7-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
@ -42,16 +47,21 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-d6f154c" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-1e620a4-1" value="true" />
<add key="darc-int-dotnet-runtime-1e620a4-2" value="true" />
<add key="darc-int-dotnet-runtime-1e620a4" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-1450763-1" value="true" />
<add key="darc-int-dotnet-templating-1450763-2" value="true" />
<add key="darc-int-dotnet-templating-1450763" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-bde268e-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-bde268e-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-bde268e-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-bde268e" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->

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.23167.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22580.2">
<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.23167.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

6
global.json
View file

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