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

Merge in 'release/7.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2024-02-15 21:21:46 +00:00
commit 5a5970d2b0
5 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
NuGet.config
View file

@ -7,22 +7,29 @@
<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-610fe43" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-610fe433/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ca51060" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ca51060-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ca51060-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-567edaf-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-567edaf-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-a73e6ff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a73e6ff2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-a73e6ff-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a73e6ff2-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-a73e6ff-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a73e6ff2-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f58ad2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f58ad2d6/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f58ad2d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f58ad2d6-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f58ad2d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f58ad2d6-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.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -44,14 +51,19 @@
<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-610fe43" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-567edaf-1" value="true" />
<add key="darc-int-dotnet-runtime-567edaf-2" value="true" />
<add key="darc-int-dotnet-runtime-567edaf" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-a73e6ff-1" value="true" />
<add key="darc-int-dotnet-sdk-a73e6ff-2" value="true" />
<add key="darc-int-dotnet-sdk-a73e6ff" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f58ad2d-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f58ad2d-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f58ad2d" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->

12
eng/Version.Details.xml
View file

@ -194,18 +194,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24059.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24059.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.24059.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24114.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- 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
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.
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 )
if [[ "$compiler" == "clang" ]]; then versions=( 17 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
for version in "${versions[@]}"; do

6
global.json
View file

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