Skip to content

Commit c982008

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into dev/v-wuzhai/enable-nullable
2 parents 73049a7 + 063ddee commit c982008

31 files changed

+356
-372
lines changed

‎Directory.Build.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
4+
<PropertyGroup>
5+
<!--
6+
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
7+
This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
8+
to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
9+
We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
10+
allow nullable warnings regardless of target framework.
11+
-->
12+
<NoWarn Condition="'$(DisableNullableWarnings)' == '' AND '$(TargetFrameworks)' != '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);Nullable</NoWarn>
13+
</PropertyGroup>
414

515
<ItemGroup>
616
<SupportedPlatform Remove="Android" />

‎documentation/package-table.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -163,21 +163,6 @@ Reference notes:
163163
[linux-arm64-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz
164164
[linux-arm64-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha512
165165

166-
[rhel-6-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
167-
[rhel-6-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-rhel.6-x64.txt
168-
[rhel-6-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
169-
[rhel-6-targz-checksum-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
170-
171-
[rhel-6-badge-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
172-
[rhel-6-version-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/productCommit-rhel.6-x64.txt
173-
[rhel-6-targz-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
174-
[rhel-6-targz-checksum-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
175-
176-
[rhel-6-badge-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
177-
[rhel-6-version-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/productCommit-rhel.6-x64.txt
178-
[rhel-6-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
179-
[rhel-6-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
180-
181166
[linux-musl-x64-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache
182167
[linux-musl-x64-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-linux-musl-x64.txt
183168
[linux-musl-x64-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz

‎eng/Version.Details.xml

Lines changed: 114 additions & 114 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -104,43 +104,43 @@
104104
</PropertyGroup>
105105
<PropertyGroup>
106106
<!-- Dependencies from https://github.com/dotnet/runtime -->
107-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETCoreAppRefPackageVersion>
108-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24610.2</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
109-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
110-
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsDependencyModelPackageVersion>
111-
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24610.2</MicrosoftNETHostModelVersion>
112-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
113-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsLoggingAbstractionsVersion>
114-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsLoggingConsoleVersion>
115-
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsLoggingVersion>
116-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETILLinkTasksPackageVersion>
117-
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24610.2</SystemServiceProcessServiceControllerVersion>
107+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftNETCoreAppRefPackageVersion>
108+
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24613.10</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
109+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24613.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
110+
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsDependencyModelPackageVersion>
111+
<MicrosoftNETHostModelVersion>10.0.0-alpha.1.24613.10</MicrosoftNETHostModelVersion>
112+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
113+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsLoggingAbstractionsVersion>
114+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsLoggingConsoleVersion>
115+
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsLoggingVersion>
116+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftNETILLinkTasksPackageVersion>
117+
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24613.10</SystemServiceProcessServiceControllerVersion>
118118
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
119-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETCorePlatformsPackageVersion>
120-
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24610.2</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
121-
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
122-
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftBclAsyncInterfacesPackageVersion>
123-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
124-
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftWin32SystemEventsPackageVersion>
119+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftNETCorePlatformsPackageVersion>
120+
<VSRedistCommonNetCoreTargetingPackx64100PackageVersion>10.0.0-alpha.1.24613.10</VSRedistCommonNetCoreTargetingPackx64100PackageVersion>
121+
<MicrosoftNETCoreAppHostwinx64PackageVersion>10.0.0-alpha.1.24613.10</MicrosoftNETCoreAppHostwinx64PackageVersion>
122+
<MicrosoftBclAsyncInterfacesPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftBclAsyncInterfacesPackageVersion>
123+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
124+
<MicrosoftWin32SystemEventsPackageVersion>10.0.0-alpha.1.24613.10</MicrosoftWin32SystemEventsPackageVersion>
125125
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
126-
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24610.2</SystemCodeDomPackageVersion>
127-
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24610.2</SystemCompositionAttributedModelPackageVersion>
128-
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24610.2</SystemCompositionConventionPackageVersion>
129-
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24610.2</SystemCompositionHostingPackageVersion>
130-
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24610.2</SystemCompositionRuntimePackageVersion>
131-
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24610.2</SystemCompositionTypedPartsPackageVersion>
132-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24610.2</SystemConfigurationConfigurationManagerPackageVersion>
133-
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24610.2</SystemReflectionMetadataLoadContextVersion>
134-
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24610.2</SystemResourcesExtensionsPackageVersion>
135-
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24610.2</SystemSecurityCryptographyPkcsPackageVersion>
136-
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24610.2</SystemSecurityCryptographyProtectedDataPackageVersion>
137-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24610.2</SystemSecurityCryptographyXmlPackageVersion>
138-
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24610.2</SystemSecurityPermissionsPackageVersion>
139-
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24610.2</SystemTextEncodingCodePagesPackageVersion>
140-
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24610.2</SystemTextJsonPackageVersion>
141-
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24610.2</SystemWindowsExtensionsPackageVersion>
142-
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24610.2</SystemIOHashingPackageVersion>
143-
<SystemFormatsAsn1Version>10.0.0-alpha.1.24610.2</SystemFormatsAsn1Version>
126+
<SystemCodeDomPackageVersion>10.0.0-alpha.1.24613.10</SystemCodeDomPackageVersion>
127+
<SystemCompositionAttributedModelPackageVersion>10.0.0-alpha.1.24613.10</SystemCompositionAttributedModelPackageVersion>
128+
<SystemCompositionConventionPackageVersion>10.0.0-alpha.1.24613.10</SystemCompositionConventionPackageVersion>
129+
<SystemCompositionHostingPackageVersion>10.0.0-alpha.1.24613.10</SystemCompositionHostingPackageVersion>
130+
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24613.10</SystemCompositionRuntimePackageVersion>
131+
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24613.10</SystemCompositionTypedPartsPackageVersion>
132+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24613.10</SystemConfigurationConfigurationManagerPackageVersion>
133+
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24613.10</SystemReflectionMetadataLoadContextVersion>
134+
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24613.10</SystemResourcesExtensionsPackageVersion>
135+
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24613.10</SystemSecurityCryptographyPkcsPackageVersion>
136+
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24613.10</SystemSecurityCryptographyProtectedDataPackageVersion>
137+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24613.10</SystemSecurityCryptographyXmlPackageVersion>
138+
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24613.10</SystemSecurityPermissionsPackageVersion>
139+
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24613.10</SystemTextEncodingCodePagesPackageVersion>
140+
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24613.10</SystemTextJsonPackageVersion>
141+
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24613.10</SystemWindowsExtensionsPackageVersion>
142+
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24613.10</SystemIOHashingPackageVersion>
143+
<SystemFormatsAsn1Version>10.0.0-alpha.1.24613.10</SystemFormatsAsn1Version>
144144
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
145145
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
146146
<MicrosoftBclAsyncInterfacesToolsetPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetPackageVersion>
@@ -220,7 +220,7 @@
220220
</PropertyGroup>
221221
<PropertyGroup>
222222
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
223-
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24612.2</MicrosoftFSharpCompilerPackageVersion>
223+
<MicrosoftFSharpCompilerPackageVersion>13.9.200-beta.24614.1</MicrosoftFSharpCompilerPackageVersion>
224224
</PropertyGroup>
225225
<PropertyGroup>
226226
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -235,19 +235,19 @@
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
238-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefPackageVersion>
239-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
244-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreTestHostPackageVersion>
245-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24611.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24611.1</dotnetdevcertsPackageVersion>
249-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24611.1</dotnetuserjwtsPackageVersion>
250-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24611.1</dotnetusersecretsPackageVersion>
238+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefPackageVersion>
239+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
244+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreTestHostPackageVersion>
245+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24614.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24614.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24614.1</dotnetdevcertsPackageVersion>
249+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24614.1</dotnetuserjwtsPackageVersion>
250+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24614.1</dotnetusersecretsPackageVersion>
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/razor -->

‎eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ variables:
2020
- name: alpineLatestContainerName
2121
value: alpineLatestContainer
2222
- name: alpineLatestContainerImage
23-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
23+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
2424

2525
- name: alpinePreviousContainerName
2626
value: alpinePreviousContainer
2727
- name: alpinePreviousContainerImage
28-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
28+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
2929

3030
- name: centOSStreamContainerName
3131
value: centOSStreamContainer
@@ -100,9 +100,9 @@ variables:
100100
- name: almaLinuxName
101101
value: AlmaLinux8
102102
- name: alpineLatestName
103-
value: Alpine320
103+
value: Alpine321
104104
- name: alpinePreviousName
105-
value: Alpine319
105+
value: Alpine320
106106
- name: centOSStreamName
107107
value: CentOSStream9
108108
- name: fedoraName
@@ -119,9 +119,9 @@ variables:
119119
- name: linuxMuslArm64Rid
120120
value: linux-musl-arm64
121121
- name: alpineLatestX64Rid
122-
value: alpine.3.20-x64
122+
value: alpine.3.21-x64
123123
- name: alpinePreviousX64Rid
124-
value: alpine.3.19-x64
124+
value: alpine.3.20-x64
125125
- name: centOSStreamX64Rid
126126
value: centos.9-x64
127127
- name: fedoraX64Rid

‎src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ public CommandResult Execute(Action<Process>? processStarted)
7474

7575
if (CommandLoggingContext.IsVerbose)
7676
{
77+
Debug.Assert(sw is not null);
7778
var message = string.Format(
7879
LocalizableStrings.ProcessExitedWithCode,
7980
FormatProcessInfo(_process.StartInfo),
8081
exitCode,
81-
sw?.ElapsedMilliseconds);
82+
sw.ElapsedMilliseconds);
8283
if (exitCode == 0)
8384
{
8485
Reporter.Verbose.WriteLine(message.Green());

‎src/Installer/pkg/dotnet-sdk.proj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<Project Sdk="Microsoft.Build.NoTargets">
22

33
<PropertyGroup>
4-
<SkipBuild Condition="'$(BuildSdkDeb)' != 'true' and '$(IsRPMBasedDistro)' != 'true'">true</SkipBuild>
4+
<BuildSdkRpm Condition="'$(BuildSdkRpm)' == '' and '$(IsRPMBasedDistro)' == 'true'">true</BuildSdkRpm>
5+
<SkipBuild Condition="'$(BuildSdkDeb)' != 'true' and '$(BuildSdkRpm)' != 'true'">true</SkipBuild>
56
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
67
<RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
78
<GenerateInstallers>true</GenerateInstallers>
89
<BuildDebPackage Condition="'$(BuildSdkDeb)' == 'true'">true</BuildDebPackage>
9-
<BuildRpmPackage Condition="'$(IsRPMBasedDistro)' == 'true'">true</BuildRpmPackage>
10+
<BuildRpmPackage Condition="'$(BuildSdkRpm)' == 'true'">true</BuildRpmPackage>
1011
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
1112
<ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
1213
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>

‎src/Installer/redist-installer/targets/Badge.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<Target Name="SetBadgeProps" DependsOnTargets="GetCurrentRuntimeInformation">
2121
<PropertyGroup>
2222
<VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
23-
<VersionBadgeMoniker Condition=" '$(Rid)' == 'rhel.6-x64' ">rhel.6_x64</VersionBadgeMoniker>
2423
<VersionBadgeMoniker Condition=" '$(Rid)' == 'linux-musl-x64' ">linux_musl_x64</VersionBadgeMoniker>
2524
<VersionBadgeMoniker Condition=" '$(IslinuxPortable)' == 'true' ">linux_$(Architecture)</VersionBadgeMoniker>
2625
<VersionBadgeMoniker Condition=" '$(IsBuildingAndPublishingAllLinuxDistrosNativeInstallers)' == 'true' ">all_linux_distros_native_installer</VersionBadgeMoniker>

‎src/Installer/redist-installer/targets/GenerateBundledVersions.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
linux-musl-x64;
155155
linux-x64;
156156
osx-x64;
157-
rhel.6-x64;
158157
tizen.4.0.0-armel;
159158
tizen.5.0.0-armel;
160159
win-arm;
@@ -440,8 +439,7 @@
440439
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
441440

442441
<_KnownRuntimeIdentiferPlatforms Include="any;aot;freebsd;illumos;solaris;unix" />
443-
<_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6;tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
444-
<_ExcludedKnownRuntimeIdentiferPlatforms Include="rhel.6" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('rhel.6-'))" />
442+
<_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0;tizen.5.0.0" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
445443
<_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.4.0.0" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.4.0.0-'))" />
446444
<_ExcludedKnownRuntimeIdentiferPlatforms Include="tizen.5.0.0" Condition="'$(DotNetBuildSourceOnly)' == 'true' and !$(ProductMonikerRid.StartsWith('tizen.5.0.0-'))" />
447445
</ItemGroup>

0 commit comments

Comments
 (0)