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

[automated] Merge branch 'release/8.0.3xx' => 'main' (#18338)

Browse source
This commit is contained in:
Michael Yanni 2024-01-23 15:56:58 -08:00 committed by GitHub
commit b8ce0e0c00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"microsoft.dotnet.darc": { "microsoft.dotnet.darc": {
"version": "1.1.0-beta.24067.3", "version": "1.1.0-beta.24073.2",
"commands": [ "commands": [
"darc" "darc"
] ]

10
.vsts-ci.yml
View file

@ -82,8 +82,8 @@ stages:
- template: eng/build.yml - template: eng/build.yml
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Fedora_36_Debug_x64 jobName: Build_Fedora_39_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
@ -100,8 +100,8 @@ stages:
- template: eng/build.yml - template: eng/build.yml
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Debian_Stretch_Debug_x64 jobName: Build_Debian_11_Debug_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64'
buildConfiguration: Debug buildConfiguration: Debug
buildArchitecture: x64 buildArchitecture: x64
additionalBuildParameters: '/p:BuildSdkDeb=true' additionalBuildParameters: '/p:BuildSdkDeb=true'
@ -201,7 +201,7 @@ stages:
parameters: parameters:
agentOs: Linux agentOs: Linux
jobName: Build_Linux_musl_Release_arm jobName: Build_Linux_musl_Release_arm
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine'
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm' runtimeIdentifier: 'linux-musl-arm'

8
eng/Version.Details.xml
View file

@ -219,13 +219,13 @@
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3e1d8f1566e3e88816e816aff285bdd709c1260a</Sha> <Sha>3e1d8f1566e3e88816e816aff285bdd709c1260a</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24067.3"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24073.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>071e96dd7619c82088d061d9736f725216db6b21</Sha> <Sha>94608f93ee72a99bd613d3f922e095daeb4d1bf1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24067.3"> <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24073.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>071e96dd7619c82088d061d9736f725216db6b21</Sha> <Sha>94608f93ee72a99bd613d3f922e095daeb4d1bf1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24072.1"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24072.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>

2
eng/Versions.props
View file

@ -44,7 +44,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24067.3</MicrosoftDotNetDarcLibVersion> <MicrosoftDotNetDarcLibVersion>1.1.0-beta.24073.2</MicrosoftDotNetDarcLibVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->