8000 [NO-MERGE] Downgrade TFMs to NetMinimum and NetFrameworkMinimum by ViktorHofer · Pull Request #1369 · dotnet/dotnet · GitHub
[go: up one dir, main page]
Skip to content

[NO-MERGE] Downgrade TFMs to NetMinimum and NetFrameworkMinimum #1369

8000
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[NO-MERGE] Downgrade TFMs to NetMinimum and NetFrameworkMinimum #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e49a9b
Downgrade TFMs to NetMinimum and NetFrameworkMinimum
ViktorHofer Jun 12, 2025
c3103b9
Update TFM in AspNetCore.InternalTesting.csproj
ViktorHofer Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/arcade/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<NetMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetMinimum>
<NetFrameworkMinimum>net472</NetFrameworkMinimum>
<XUnitPublishTargetFramework>$(NetMinimum)</XUnitPublishTargetFramework>
</PropertyGroup>

</Project>
2 changes: 0 additions & 2 deletions src/arcade/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistVersion)" />
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
<!-- corefx -->
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformation)" />
<!-- deployment-tools -->
<PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
<!-- dotnet-symuploader -->
Expand Down
4 changes: 2 additions & 2 deletions src/arcade/Documentation/HowToCreatePackages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ One of the goals of Arcade is to be a vehicle to provide code sharing. One of th

- If your package produces binaries that need to be signed, make sure to mark it as <IsPackable>true</IsPackable> or check the SignTool [documentation](../src/Microsoft.DotNet.SignTool/README.md) to see how to sign specific files.

- If the package needs to target a version of .NET Framework we recommend you to use the Arcade defined version, which is stored in the $(NetFxTfm) property. For instance:
- If the package needs to target a version of .NET Framework we recommend you to use the Arcade defined version, which is stored in the $(NetFrameworkMinimum) property. For instance:

`<TargetFrameworks>$(NetFxTfm);netcoreapp2.0</TargetFrameworks>`
`<TargetFrameworks>$(NetFrameworkMinimum);netcoreapp2.0</TargetFrameworks>`

- There is no requirement to create a separate `.nuspec` file for the package. The package information will be automatically extracted from the `.csproj` file.

Expand Down
8 changes: 4 additions & 4 deletions src/arcade/eng/Microsoft.DotNet.SwaggerGenerator.MSBuild.InTree.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Microsoft.DotNet.SwaggerGenerator', 'Microsoft.DotNet.SwaggerGenerator.MSBuild'))</MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>
<MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>$(ArtifactsBinDir)Microsoft.DotNet.SwaggerGenerator.MSBuild\$(Configuration)\</MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>
<!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
<MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
<MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetFrameworkToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
<MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetMinimum)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
<MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetFrameworkMinimum)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
<!-- Swagger generator msbuild tasks should be invoked out-of-proc in this repository to avoid assembly lock issues. -->
<MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>TaskHostFactory</MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>
<!-- Make sure that the P2Ps are built before swagger generator targets are invoked. -->
Expand All @@ -26,8 +26,8 @@
PrivateAssets="all"
Private="false">
<!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(NetToolCurrent)</SetTargetFramework>
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkToolCurrent)</SetTargetFramework>
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(NetMinimum)</SetTargetFramework>
<SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkMinimum)</SetTargetFramework>
</ProjectReference>
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/arcade/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,19 @@
<Sha>f8e423db429900ec56bbbc7e76d8d8711ab0c1f9</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<Dependency Name="Microsoft.Build" Version="17.12.36">
<Dependency Name="Microsoft.Build" Version="17.11.31">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="17.12.36">
<Dependency Name="Microsoft.Build.Framework" Version="17.11.31">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.12.36">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.31">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.12.36">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.11.31">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3</Sha>
</Dependency>
Expand Down
10 changes: 4 additions & 6 deletions src/arcade/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,16 @@
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25324.1</MicrosoftDotNetDarcLibVersion>
<!-- command-line-api -->
<SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
<!-- corefx -->
<SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
<!-- deployment-tools -->
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>
<!-- dotnet-symuploader -->
<MicrosoftSymbolUploaderBuildTaskVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderBuildTaskVersion>
<MicrosoftSymbolUploaderVersion>2.0.0-preview.1.23470.14</MicrosoftSymbolUploaderVersion>
<!-- msbuild -->
<MicrosoftBuildFrameworkVersion>17.12.36</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.12.36</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.12.36</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildVersion>17.12.36</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>17.11.31</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildTasksCoreVersion>17.11.31</MicrosoftBuildTasksCoreVersion>
<MicrosoftBuildUtilitiesCoreVersion>17.11.31</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildVersion>17.11.31</MicrosoftBuildVersion>
<!-- netstandard -->
<NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
<!-- nuget -->
Expand Down
7 changes: 6 additions & 1 deletion src/arcade/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100-preview.6.25315.102"
"dotnet": "10.0.100-preview.6.25315.102",
"runtimes": {
"dotnet": [
"8.0.17"
]
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25324.2",
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
3 changes: 1 addition & 2 deletions src/arcade/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!-- Treat this as a tooling library as it references msbuild. -->
<TargetFrameworks>$(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<IsPackable>true</IsPackable>
<DefaultExcludesInProjectFolder Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETFramework'">**/*.Desktop.*</DefaultExcludesInProjectFolder>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
<IsTestUtilityProject>true</IsTestUtilityProject>
</PropertyGroup>

Expand Down
3 changes: 1 addition & 2 deletions src/arcade/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!-- Treat this as a tooling library. -->
<TargetFrameworks>$(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
<IsPackable>true</IsPackable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<Targ B95D etFramework>$(NetMinimum)</TargetFramework>
<DefaultItemExcludes>$(DefaultItemExcludes);testassets\**\*</DefaultItemExcludes>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<IsPackable>true</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
-->

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishBuildAssets.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Import Project="..\Version.BeforeCommonTargets.targets" />

<PropertyGroup>
<TargetFramework>$(NetFrameworkToolCurrent)</TargetFramework>
<TargetFramework>$(NetFrameworkMinimum)</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishToSymbolServers.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Publish</NETCORE_ENGINEERING_TELEMETRY>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Import Condition="Exists('$(BuildManifestFile)')" Project="$(BuildManifestFile)" />

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<NETCORE_ENGINEERING_TELEMETRY>Build</NETCORE_ENGINEERING_TELEMETRY>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<SNBinaryPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(NuGetPackageRoot)sn\$(SNVersion)\sn.exe</SNBinaryPath>

<!-- .pkgs and .app bundle tooling is only available on MacOS -->
<PkgToolPath Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(NuGetPackageRoot)microsoft.dotnet.macospkg.cli\$(MicrosoftDotNetMacOsPkgVersion)\tools\$(NetToolCurrent)\any\Microsoft.Dotnet.MacOsPkg.Cli.dll</PkgToolPath>
<PkgToolPath Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(NuGetPackageRoot)microsoft.dotnet.macospkg.cli\$(MicrosoftDotNetMacOsPkgVersion)\tools\$(NetMinimum)\any\Microsoft.Dotnet.MacOsPkg.Cli.dll</PkgToolPath>
</PropertyGroup>

<Error Condition="'$(AllowEmptySignList)' != 'true' AND '@(ItemsToSign)' == ''"
Expand Down Expand Up @@ -90,7 +90,7 @@
SNBinaryPath="$(SNBinaryPath)"
MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"
WixToolsPath="$(WixInstallPath)"
TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetTarVersion)\tools\$(NetToolCurrent)\any\Microsoft.Dotnet.Tar.dll"
TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetTarVersion)\tools\$(NetMinimum)\any\Microsoft.Dotnet.Tar.dll"
PkgToolPath="$(PkgToolPath)"
RepackParallelism="$(SignToolRepackParallelism)"
MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)"
Expand Down
2 changes: 1 addition & 1 deletion ...rc/Microsoft.DotNet.ArcadeAzureIntegration/Microsoft.DotNet.ArcadeAzureIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...de/src/Microsoft.DotNet.Build.Manifest.Tests/Microsoft.DotNet.Build.Manifest.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Build.Manifest/Microsoft.DotNet.Build.Manifest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...de/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<IsPackable>true</IsPackable>
<IsBuildTaskProject>true</IsBuildTaskProject>
<PackTasks>false</PackTasks>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
<TargetFramework>$(NetMinimum)</TargetFramework>
<SignAssembly>false</SignAssembly>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>false</SignAssembly>
<Description>This package provides support for publishing assets to appropriate channels.</Description>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
F438 View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<IsBuildTaskProject>true</IsBuildTaskProject>
Expand Down
19 changes: 2 additions & 17 deletions src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateRpmPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,7 @@ public sealed class CreateRpmPackage : BuildTask

public override bool Execute()
{
var arch = PackageArchitecture switch
{
"x86" => Architecture.X86,
"x64" => Architecture.X64,
"arm" => Architecture.Arm,
"arm64" => Architecture.Arm64,
#if NET
"armv6" => Architecture.Armv6,
"s390x" => Architecture.S390x,
"ppc64le" => Architecture.Ppc64le,
"riscv64" => Architecture.RiscV64,
"loongarch64" => Architecture.LoongArch64,
#endif
_ => throw new ArgumentException($"Unknown architecture: {PackageArchitecture}")
};
RpmBuilder builder = new(PackageName, PackageVersion, PackageRelease, arch, OSPlatform.Create(PackageOS))
RpmBuilder builder = new(PackageName, PackageVersion, PackageRelease, PackageArchitecture, OSPlatform.Create(PackageOS))
{
Vendor = Vendor,
Packager = Packager,
Expand All @@ -107,7 +92,7 @@ public override bool Execute()
}

builder.AddProvidedCapability(PackageName, PackageVersion);
builder.AddProvidedCapability($"{PackageName}({RpmBuilder.GetRpmHeaderArchitecture(arch)})", PackageVersion);
builder.AddProvidedCapability($"{PackageName}({RpmBuilder.GetRpmHeaderArchitecture(PackageArchitecture)})", PackageVersion);

HashSet<string> ownedDirectories = new(OwnedDirectories.Select(d => d.ItemSpec));

Expand Down
2 changes: 1 addition & 1 deletion src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/src/HexConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#if NET
#if NET9_0_OR_GREATER
global using HexConverter = System.Convert;
#else
using System;
Expand Down
Loading
Loading
0