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

Merge branch 'main' into mac-vmr

Browse source
This commit is contained in:
Jo Shields 2023-12-08 15:35:20 -05:00 • committed by GitHub
commit 96e168982f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eng/SourceBuildPrebuiltBaseline.xml
View file

@ -3,8 +3,6 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
<!--
Temporary exclusion for NuGet packages, since NuGet is not producing source-build intermediate package,
see: https://github.com/NuGet/Home/issues/11059

20
eng/Version.Details.xml
View file

@ -206,18 +206,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23606.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>71149d1f281ab5e066d1f524f4862152683f5144</Sha>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23606.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23607.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>71149d1f281ab5e066d1f524f4862152683f5144</Sha>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23606.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23607.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>71149d1f281ab5e066d1f524f4862152683f5144</Sha>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -227,17 +227,17 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23606.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23607.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>71149d1f281ab5e066d1f524f4862152683f5144</Sha>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23565.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23608.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>b5ceed90b72d1b05975dd95fedd86c2455969adb</Sha>
<Sha>9e09ace1897546ac85dab114a6e1a5b6f773db7a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="8.0.0-preview.23424.2">

2
eng/Versions.props
View file

@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23606.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23607.2</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": "9.0.0-beta.23606.1",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23606.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23607.2"
}
}

2
src/core-sdk-tasks/BuildFPMToolPreReqs.cs
View file

@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks
// -a : architecture --JSON
// -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON
// --rpm-os : the operating system to target this rpm --Static
// --rpm-digest : rpm digest algorithm --Static
// --rpm-changelog : the changelog from FILEPATH contents --ARG
// --rpm-summary : it is the RPM summary that shows in the Title --JSON
// --description : it is the description for the package --JSON
@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks
}
parameters.Add("--rpm-os linux");
parameters.Add("--rpm-digest sha256");
parameters.Add(string.Concat("--rpm-changelog ",
EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File
parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description)));