|
92 | 92 | <PropertyGroup> |
93 | 93 | <InstallerOutputDirectory>$(ArtifactsShippingPackagesDir)</InstallerOutputDirectory> |
94 | 94 | <SdkDebInstallerFile>$(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkDebInstallerFile> |
| 95 | + <NewKeyDebInstallerFile>$(InstallerOutputDirectory)$(NewKeyArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</NewKeyDebInstallerFile> |
95 | 96 | <SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory> |
96 | 97 | <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)deb-tool-output</DotNetDebToolOutputDirectory> |
97 | 98 | <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)debian-testResults.xml</DebianTestResultsXmlFile> |
|
220 | 221 |
|
221 | 222 | <AspNetVersionPatchSeparator>$(AspNetSimpleVersion.LastIndexOf('.'))</AspNetVersionPatchSeparator> |
222 | 223 | <AspNetSimpleVersion Condition=" '$(AspNetVersionPatchSeparator)' != -1 ">$(AspNetSimpleVersion.Substring(0, $(AspNetVersionPatchSeparator)))</AspNetSimpleVersion> |
223 | | - |
| 224 | + |
224 | 225 | <!-- dotnet-runtime package may not currently be available --> |
225 | 226 | <InstallAspNetCoreSharedFxArgs>--ignore-depends=dotnet-runtime-$(AspNetSimpleVersion)</InstallAspNetCoreSharedFxArgs> |
226 | 227 | </PropertyGroup> |
|
315 | 316 | OverwriteReadOnlyFiles="True" |
316 | 317 | SkipUnchangedFiles="False" |
317 | 318 | UseHardlinksIfPossible="False" /> |
318 | | - |
| 319 | + <Copy |
| 320 | + DestinationFiles="$(NewKeyDebInstallerFile)" |
| 321 | + SourceFiles="@(GeneratedDebFiles)" |
| 322 | + OverwriteReadOnlyFiles="True" |
| 323 | + SkipUnchangedFiles="False" |
| 324 | + UseHardlinksIfPossible="False"/> |
319 | 325 | <!-- Proactively remove all possible Shared Framework and Debian Packages --> |
320 | 326 | <ItemGroup> |
321 | 327 | <SetupDebPackageToRemove Include="$(SdkDebianPackageName)" /> |
|
374 | 380 | <DotNetTest ProjectPath="$(EndToEndTestProject)" |
375 | 381 | EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)" |
376 | 382 | ToolPath="$(DebianInstalledDirectory)" />--> |
377 | | - |
| 383 | + |
378 | 384 | <!-- Clean up Packages --> |
379 | 385 | <!-- The following line is needed. So it won't warning dotnet folder is not empty after uninstall --> |
380 | 386 | <Exec Command="sudo rm -rf /usr/share/dotnet/sdk/NuGetFallbackFolder" /> |
|
0 commit comments