-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Remove .NET Standard 2.1 Targeting Pack from installers #50354
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.
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -30,7 +30,6 @@ | |||
| <ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName> | ||||
| <SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName> | ||||
| <NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName> | ||||
| <NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName> | ||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Line 143 in fc373ee
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let me check. We do need some information when generating the bundled versions to know what the latest version of the actual reference pack is when we go online to retrieve it.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, np and it's not necessarily needed for this PR, but seems like a nice to have if doable.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ok, as expected, this is used when generating the bundled versions file we include with the SDK, so that should stay where it is
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we can actually remove this one since we're already setting the property in Versions.props: #50533 |
||||
| <NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName> | ||||
| <SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName> | ||||
| <HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName> | ||||
|
|
||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,6 @@ | |
| <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion> | ||
| <NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion> | ||
| <WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppInternalPackageVersion)</WindowsDesktopBlobVersion> | ||
| <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion> | ||
|
|
||
| <AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x86'">x64</AlternateArchitecture> | ||
| <AlternateArchitecture Condition="'$(TargetArchitecture)' == 'x64'">x86</AlternateArchitecture> | ||
|
|
@@ -28,11 +27,6 @@ | |
| <DownloadedAlternateNetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension)</DownloadedAlternateNetCoreAppHostPackInstallerFileName> | ||
| <DownloadedArm64NetCoreAppHostPackInstallerFileName Condition="'$(InstallerExtension)' != ''">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName> | ||
| <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName> | ||
| <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName> | ||
| <!-- osx-arm64 netstandard targeting pack pkg is unavailable. Use osx-x64. | ||
| This should be OK, because the package is just a compressed file containing reference assemblies and | ||
| runtime independent manifest text files. --> | ||
| <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(SharedFrameworkInstallerFileRid)' == 'osx-arm64'">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName> | ||
|
|
||
| <SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName> | ||
| <SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName> | ||
|
|
@@ -65,7 +59,6 @@ | |
|
|
||
| <!-- Generate the version specific URLs to the targeting packs, runtime packs, etc. --> | ||
| <NetRuntimeRootUrl>$(PublicBaseURL)Runtime/$(NetRuntimeBlobVersion)</NetRuntimeRootUrl> | ||
| <NetStandardTargetingPackRootUrl>$(OfficialBaseURL)Runtime/$(NETStandardTargetingPackBlobVersion)</NetStandardTargetingPackRootUrl> | ||
| <AspNetCoreSharedFxRootUrl>$(PublicBaseURL)aspnetcore/Runtime/$(AspNetCoreBlobVersion)</AspNetCoreSharedFxRootUrl> | ||
| <WinFormsAndWpfSharedFxRootUrl>$(PublicBaseURL)WindowsDesktop/$(WindowsDesktopBlobVersion)</WinFormsAndWpfSharedFxRootUrl> | ||
| <SdkRootUrl>$(PublicBaseURL)Sdk/$(FullNugetVersion)</SdkRootUrl> | ||
|
|
@@ -81,11 +74,6 @@ | |
| PackageVersion="$(MicrosoftNETCoreAppRefPackageVersion)" | ||
| RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" /> | ||
|
|
||
| <BundledLayoutPackage Include="NETStandard.Library.Ref" | ||
| PackageName="NETStandard.Library.Ref" | ||
| PackageVersion="$(NETStandardLibraryRefPackageVersion)" | ||
| RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" /> | ||
|
|
||
| <BundledLayoutPackage Include="Microsoft.AspNetCore.App.Ref" | ||
| PackageName="Microsoft.AspNetCore.App.Ref" | ||
| PackageVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" | ||
|
|
@@ -212,13 +200,6 @@ | |
| <DownloadFileName>$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadFileName> | ||
| </BundledInstallerComponent> | ||
|
|
||
| <!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? --> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hey, that's exciting, I love that we can remove a TODO
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NET Standard 2.1 was created as part of .NET Core 3.0, long before we had support for ARM64 installers. |
||
| <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile" | ||
| Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'osx-arm64')"> | ||
| <BaseUrl>$(NetStandardTargetingPackRootUrl)</BaseUrl> | ||
| <DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName> | ||
| </BundledInstallerComponent> | ||
|
|
||
| <BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile" | ||
| Condition="'$(InstallerExtension)' != '' And (!$(TargetArchitecture.StartsWith('arm')) or '$(TargetRid)' == 'win-arm64' or '$(TargetRid)' == 'osx-arm64')"> | ||
| <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl> | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why this file change? Did this file get modified in your local build?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, let me check, that seems suspect. My changes should only impact props/targets, not any .md files
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file gets touched by a build task in src/Microsoft.CodeAnalysis.NetAnalyzers. Maybe that's why.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've tried resetting it, but I can't make it go away at all. this doesn't make sense.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be fixed in the last commit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we can get rid of the .ttf and .otf signing now?
sdk/eng/Signing.props
Line 37 in fc373ee
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is unrelated to this change. The signing props comment is just a general reference that likely came from Arcade or was copied over from the base copy in the Arcade repo.