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

Merge in 'release/7.0.4xx' changes

Browse source
This commit is contained in:
dotnet-bot 2023-11-07 20:21:15 +00:00
commit 105e9e75d7
4 changed files with 9 additions and 10 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.23517.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23556.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb3ccc523ed844c82a63898ed3fa269680396f26</Sha>
<Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23517.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23556.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb3ccc523ed844c82a63898ed3fa269680396f26</Sha>
<Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23517.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23556.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb3ccc523ed844c82a63898ed3fa269680396f26</Sha>
<Sha>0cf959c996dd33379cb6e87532c008669e0ae06f</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
<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.23517.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23556.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

1
eng/common/templates/post-build/common-variables.yml
View file

@ -1,6 +1,5 @@
variables:
- group: AzureDevOps-Artifact-Feeds-Pats
- group: DotNet-Blob-Feed
- group: DotNet-DotNetCli-Storage
- group: DotNet-MSRC-Storage
- group: Publish-Build-Assets

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6"
}
}