Merge commit 'aea22332d6908d84626ffa94c4fcbfbde8203c5a'

Author: Mirroring

.azure/pipelines/identitymodel-helix-matrix.yml

@@ -26,7 +26,7 @@ resources:
     ref: refs/tags/release
 
 extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
   parameters:
     sdl:
       sourceAnalysisPool:

src/Installers/Debian/Directory.Build.targets

@@ -60,5 +60,6 @@
     </PropertyGroup>
 
     <Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(TargetPath)" />
+    <Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(OutputPath)$(NewKeyTargetFileName)" />
   </Target>
 </Project>

src/Installers/Debian/Runtime/Debian.Runtime.debproj

@@ -34,6 +34,7 @@
 
   <PropertyGroup>
     <TargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.deb</TargetFileName>
+    <NewKeyTargetFileName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)-newkey-x64.deb</NewKeyTargetFileName>
     <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
     <!-- DebPackageVersion does not match the ASP.NET Core runtime verison. -->
     <DebPackageVersion>$(VersionPrefix)</DebPackageVersion>

src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj

@@ -38,6 +38,7 @@
 
   <PropertyGroup>
     <TargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(TargetArchitecture).deb</TargetFileName>
+    <NewKeyTargetFileName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-newkey-$(TargetArchitecture).deb</NewKeyTargetFileName>
     <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
 
     <DebPackageVersion>$(TargetingPackVersionPrefix)</DebPackageVersion>

src/Installers/Rpm/Directory.Build.props

@@ -11,6 +11,7 @@
 
     <CblMariner1VersionSuffix>-cm.1</CblMariner1VersionSuffix>
     <CblMariner2VersionSuffix>-cm.2</CblMariner2VersionSuffix>
+    <NewKeyVersionSuffix>-newkey</NewKeyVersionSuffix>
 
     <!-- All installers are shipping assets. -->
     <IsShipping>true</IsShipping>

src/Installers/Rpm/Directory.Build.targets

@@ -40,6 +40,7 @@
     <PropertyGroup>
       <CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath>
       <CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath>
+      <NewKeyTargetPath>$(InstallersOutputPath)$(NewKeyBaseName)$(NewKeyVersionSuffix)$(NewKeyExtension)</NewKeyTargetPath>
     </PropertyGroup>
 
     <!-- Create layout: Create changelog -->
@@ -103,5 +104,13 @@
           UseHardlinksIfPossible="False" />
 
     <Message Text="$(TargetPath) -> $(CblMariner2TargetPath)" Importance="high" />
+
+    <Copy SourceFiles="$(TargetPath)"
+          DestinationFiles="$(NewKeyTargetPath)"
+          OverwriteReadOnlyFiles="True"
+          SkipUnchangedFiles="False"
+          UseHardlinksIfPossible="False" />
+
+    <Message Text="$(TargetPath) -> $(NewKeyTargetPath)" Importance="high" />
   </Target>
 </Project>

src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj

@@ -16,5 +16,7 @@
     <TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
     <CblMarinerBaseName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)</CblMarinerBaseName>
     <CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
+    <NewKeyBaseName>$(RuntimeInstallerBaseName)-$(SharedFxVersion)</NewKeyBaseName>
+    <NewKeyExtension>-$(RpmArch).rpm</NewKeyExtension>
   </PropertyGroup>
 </Project>

src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj

@@ -33,6 +33,8 @@
     <TargetPath>$(InstallersOutputPath)$(TargetFileName)</TargetPath>
     <CblMarinerBaseName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)</CblMarinerBaseName>
     <CblMarinerExtension>-$(RpmArch).rpm</CblMarinerExtension>
+    <NewKeyBaseName>$(TargetingPackInstallerBaseName)-$(TargetingPackVersion)</NewKeyBaseName>
+    <NewKeyExtension>-$(RpmArch).rpm</NewKeyExtension>
 
     <PackageVersion>$(TargetingPackVersionPrefix)</PackageVersion>