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

Merged PR 36650: [internal/release/7.0.3xx] Merge from public

Browse source 
Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
This commit is contained in:
Sean Reeser 2024-01-19 01:59:06 +00:00
commit e97bad6e39
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -192,18 +192,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.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</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.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</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.24065.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</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>

4
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.24065.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -219,7 +219,7 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltArtifactsPackageVersion>7.0.114</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>7.0.115</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->
<PropertyGroup>

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

4
global.json
View file

@ -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.24065.4",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24065.4"
}
}

2
src/SourceBuild/tarball/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.114"
"dotnet": "7.0.115"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",