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

[release/7.0.1xx] Update dependencies from dotnet/arcade (#16054)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2023-04-11 13:39:29 -07:00 committed by GitHub
parent 7ba969ee6e
commit 555a668e45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
NuGet.config
View file

@ -9,11 +9,6 @@
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted --> <!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-2eac915" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2eac9157/nuget/v3/index.json" /> <add key="darc-pub-DotNet-msbuild-Trusted-2eac915" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2eac9157/nuget/v3/index.json" />
@ -21,17 +16,8 @@
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8c1421b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -56,17 +42,8 @@
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8c1421b-1" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b-2" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b-3" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b" value="true" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

12
eng/Version.Details.xml
View file

@ -194,18 +194,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23211.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha> <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23164.3"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23211.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha> <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23211.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha> <Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23211.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

2
eng/common/native/init-compiler.sh
View file

@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
# Set default versions # Set default versions
if [[ -z "$majorVersion" ]]; then if [[ -z "$majorVersion" ]]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
for version in "${versions[@]}"; do for version in "${versions[@]}"; do

6
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "7.0.104", "dotnet": "7.0.105",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2"
} }
} }