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

Merge commit 'ad0c7b0efb'

Browse source
This commit is contained in:
Mirroring 2024-10-03 16:36:39 +00:00
commit 6061840909
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

@ -392,7 +392,7 @@ extends:
agentOs: Darwin
pool:
name: Azure Pipelines
image: macOS-latest
image: macos-13
os: macOS
timeoutInMinutes: 180
strategy:

2
.vsts-pr.yml
View file

@ -345,7 +345,7 @@ stages:
parameters:
agentOs: Darwin
pool:
vmImage: 'macOS-latest'
vmImage: 'macos-13'
timeoutInMinutes: 180
strategy:
matrix:

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24463.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24459.5">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24463.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24459.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24463.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.24266.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

4
eng/Versions.props
View file

@ -8,7 +8,7 @@
<VersionMajor>6</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionFeature>35</VersionFeature>
<VersionFeature>36</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24463.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24459.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1"
}
}