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

Merge branch 'main' into darc-main-35b1ce53-93f3-4548-9141-a67575ca61c3

Browse source
This commit is contained in:
Michael Simons 2023-06-12 07:38:32 -05:00 committed by GitHub
commit af58a22c9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

@ -237,7 +237,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_Portable_Deb_Release_x64
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
buildConfiguration: Release
buildArchitecture: x64
# Do not publish zips and tarballs. The linux-x64 binaries are

12
eng/Version.Details.xml
View file

@ -202,18 +202,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23308.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23309.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23308.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23309.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23308.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23309.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1205248d5cc014b68c2fb8cfbf091a77aa433453</Sha>
<Sha>9994c5ed43856c35591d94ead68ef501a020eb2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23307.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props
View file

@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23308.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23309.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23308.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23308.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23309.8",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23309.8"
}
}

8
src/redist/targets/GenerateBundledVersions.targets
View file

@ -324,6 +324,12 @@
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
<_KnownRuntimeIdentiferPlatforms Include="any;aot;freebsd;illumos;solaris;unix" />
<_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" />
<_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.4.0.0-'))" />
<_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.5.0.0" Condition="'$(DotNetBuildFromSource)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.5.0.0-'))" />
</ItemGroup>
<!--
@ -1130,6 +1136,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<WindowsSdkSupportedTargetPlatformVersion Include="8.0" />
<WindowsSdkSupportedTargetPlatformVersion Include="7.0" />
<_KnownRuntimeIdentiferPlatforms Include="@(_KnownRuntimeIdentiferPlatforms, '%3B')" />
<_ExcludedKnownRuntimeIdentiferPlatforms Include="@(_ExcludedKnownRuntimeIdentiferPlatforms, '%3B')" />
</ItemGroup>
</Project>
]]>