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

Merge in 'release/7.0.3xx' changes

Browse source
This commit is contained in:
dotnet-bot 2024-01-10 17:28:40 +00:00
commit 52031d10b0
4 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eng/Version.Details.xml
View file

@ -180,9 +180,9 @@
<Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha> <Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
<SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" /> <SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.23601.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24059.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-source-build-externals</Uri> <Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>d6ad546c83ce94b3efb4662513bed71a3e6192ef</Sha> <Sha>4bed7bdd937666fac4c4f351b9b02adddf8d035b</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" /> <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02"> <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
@ -192,22 +192,22 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23620.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24059.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha> <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23620.3"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.24059.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha> <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23620.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ef97d6e7478f4ae77cf6e827ee40e8c41120093c</Sha> <Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23578.1"> <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> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>6d5841c05f04d60eccf3358588b8c8968215d9e2</Sha> <Sha>727ef4887d561dae6069d6b9c035773013dad041</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" /> <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22429-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22429-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

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.23620.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

6
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "7.0.113", "dotnet": "7.0.115",
"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.23620.3", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5"
} }
} }

3
src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
View file

@ -172,9 +172,8 @@
WorkingDirectory="$(TarballRepoSourceDir)" WorkingDirectory="$(TarballRepoSourceDir)"
Condition="$(IsRootRepo) != 'true'" /> Condition="$(IsRootRepo) != 'true'" />
<Exec <Exec
Command="git -c http.https://dnceng@dev.azure.com/.extraheader='AUTHORIZATION: bearer $(AzDoPat)' submodule update --init --recursive" Command="git submodule update --init --recursive --depth 1"
WorkingDirectory="$(TarballRepoSourceDir)" /> WorkingDirectory="$(TarballRepoSourceDir)" />
<Exec <Exec