Merge branch 'main' into crossbuildVMR
This commit is contained in:
Jackson Schuster
GitHub
commit
312648bd49
5 changed files with 55 additions and 14 deletions
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
@ -146,8 +146,10 @@
|
|||
Therefore we stay at last month's version.
|
||||
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
|
||||
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
|
||||
Preview releases already use -1 versionining so don't subtract one for that version
|
||||
Preview releases already use -1 versionining so don't subtract one for that version.
|
||||
In public builds, we always use the 2 month old version.
|
||||
-->
|
||||
<SubtractOneFromTemplateVersions Condition="'$(SYSTEM_TEAMPROJECT)' != 'internal'">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
|
||||
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
|
||||
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
37
src/SourceBuild/patches/runtime/0001-Use-net9.0-TFM.patch
Normal file
37
src/SourceBuild/patches/runtime/0001-Use-net9.0-TFM.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Thu, 7 Dec 2023 15:53:03 -0600
|
||||
Subject: [PATCH] Use net9.0 TFM
|
||||
|
||||
Backport: https://github.com/dotnet/source-build/issues/3663
|
||||
---
|
||||
Directory.Build.props | 2 +-
|
||||
src/tools/illink/src/ILLink.Tasks/LinkTask.cs | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
||||
index 2a5cd307f52..a068060eab8 100644
|
||||
--- a/Directory.Build.props
|
||||
+++ b/Directory.Build.props
|
||||
@@ -99,7 +99,7 @@
|
||||
<!-- when this is updated, make sure to keep $(_TargetFrameworkForNETCoreTasks)
|
||||
in src/mono/wasm/build/WasmApp.LocalBuild.props
|
||||
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
|
||||
- <NetCoreAppToolCurrentVersion>8.0</NetCoreAppToolCurrentVersion>
|
||||
+ <NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
|
||||
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
|
||||
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
|
||||
|
||||
diff --git a/src/tools/illink/src/ILLink.Tasks/LinkTask.cs b/src/tools/illink/src/ILLink.Tasks/LinkTask.cs
|
||||
index 5ac4ecd46ce..9fd5c536603 100644
|
||||
--- a/src/tools/illink/src/ILLink.Tasks/LinkTask.cs
|
||||
+++ b/src/tools/illink/src/ILLink.Tasks/LinkTask.cs
|
||||
@@ -262,7 +262,7 @@ public class ILLink : ToolTask
|
||||
var taskDirectory = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
|
||||
#pragma warning restore IL3000 // Avoid accessing Assembly file path when publishing as a single file
|
||||
// IL Linker always runs on .NET Core, even when using desktop MSBuild to host ILLink.Tasks.
|
||||
- _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net8.0", "illink.dll");
|
||||
+ _illinkPath = Path.Combine (Path.GetDirectoryName (taskDirectory), "net9.0", "illink.dll");
|
||||
return _illinkPath;
|
||||
}
|
||||
set => _illinkPath = value;
|
||||
|
|
@ -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)));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue