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

Merge branch 'main' of https://github.com/dotnet/installer into TestProjectValidation

Browse source
This commit is contained in:
Jackson Schuster 2024-03-21 08:24:32 -07:00
commit 3a96da9876
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -243,17 +243,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24165.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24170.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24165.6">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24170.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24165.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24170.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -263,14 +263,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24165.6">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24170.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24165.6">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24170.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
<Sha>117337a1e7024e31b321d44d8b71a821e69c3967</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24165.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24170.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
eng/build.yml
View file

@ -251,8 +251,8 @@ jobs:
inputs:
SourceFolder: '$(installerRoot)/artifacts'
Contents: |
log/${{ parameters.buildConfiguration }}/**/*
TestResults/${{ parameters.buildConfiguration }}/**/*
log/${{ parameters.buildConfiguration }}/**/*
TestResults/${{ parameters.buildConfiguration }}/**/*
TargetFolder: '$(Build.ArtifactStagingDirectory)'
continueOnError: true
condition: always()

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.6",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24165.6"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24170.7",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24170.7"
}
}