Merge branch 'release/2.1' into release/2.2

.azure/pipelines/ci-official.yml

@@ -4,7 +4,6 @@ trigger:
     - master
     - release/*
     exclude:
-    - release/2.1
     - release/2.0
 
 phases:
@@ -39,10 +38,9 @@ phases:
       signType: $(_SignType)
       zipSources: false
   # TODO: configure build.cmd to build both x64 and x86 in one invocation
-  # TODO build.cmd -ci
+  - script: build.cmd -ci /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:Build /t:BuildSharedFx /p:SharedFxRID=win-x64 /t:BuildFallbackArchive
-  - script: build.cmd /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:Build /t:BuildSharedFx /p:SharedFxRID=win-x64 /t:BuildFallbackArchive
     displayName: Build NuGet packages and win-x64 runtime
-  - script: build.cmd /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:BuildSharedFx /p:SharedFxRID=win-x86
+  - script: build.cmd -ci /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:BuildSharedFx /p:SharedFxRID=win-x86
     displayName: Build win-x86 runtime
   - powershell: >
       src/Installers/Windows/clone_and_build_ancm.ps1

Directory.Build.props

@@ -2,10 +2,15 @@
   <Import Project="version.props" />
 
   <PropertyGroup>
+    <Product>Microsoft ASP.NET Core</Product>
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <RepositoryUrl>https://github.com/aspnet/Universe</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <Import Project="build\common.props" />
   <Import Project="build\external-dependencies.props" />
   <Import Project="build\sources.props" />
 

Directory.Build.targets

@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
     <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>

build/SharedFx.targets

@@ -1,5 +1,4 @@
 <Project>
-  <Import Project="common.props" />
   <Import Project="SharedFx.props" />
 
   <PropertyGroup>

build/common.props

@@ -1,13 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <Product>Microsoft ASP.NET Core</Product>
-    <RepositoryUrl>https://github.com/aspnet/Universe</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
-    <AssemblyOriginatorKeyFile>$(RepositoryRoot)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-</Project>

build/repo.targets

@@ -205,8 +205,8 @@
       Condition="'$(KOREBUILD_REPOSITORY_INCLUDE)' != '' AND '$(KOREBUILD_REPOSITORY_EXCLUDE)' != ''" />
 
     <ItemGroup>
-      <Repository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" />
+      <Repository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" Condition="'%(Identity)' != '' AND '%(RootPath)' == ''"  />
-      <ShippedRepository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" Condition="'%(Identity)' != ''" />
+      <ShippedRepository Update="%(Identity)" RootPath="$(SubmoduleRoot)%(Identity)\" Condition="'%(Identity)' != '' AND '%(RootPath)' == ''" />
 
       <SubmoduleGlobalJsonFiles Include="%(Repository.RootPath)global.json" BackupPath="$(IntermediateDir)%(Repository.Identity)-global.json" Condition="'%(Repository.Identity)' != ''"/>
       <SubmoduleGlobalJsonFiles Include="%(ShippedRepository.RootPath)global.json" BackupPath="$(IntermediateDir)%(ShippedRepository.Identity)-global.json" Condition="'%(ShippedRepository.Identity)' != ''"/>

build/submodules.props

@@ -22,10 +22,12 @@
 
        -->
       <PatchPolicy>ProductChangesOnly</PatchPolicy>
+      <RootPath></RootPath>
     </Repository>
     <ShippedRepository>
       <Build>false</Build>
       <PatchPolicy>ProductChangesOnly</PatchPolicy>
+      <RootPath></RootPath>
     </ShippedRepository>
   </ItemDefinitionGroup>
 

run.sh

@@ -262,7 +262,7 @@ if [ -f "$config_file" ]; then
             exit 1
         fi
     else
-        __error 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
+        __error 'Missing required command: jq or python. Could not parse the JSON file. Its settings will be ignored.'
         exit 1
     fi
 

scripts/common.psm1

@@ -243,6 +243,7 @@ function UpdateVersions([hashtable]$variables, [xml]$dependencies, [string]$deps
 
     return $updatedVars
 }
+
 function Get-MSBuildPath {
     param(
         [switch]$Prerelease,
@@ -310,4 +311,4 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) {
     }
 
     Write-Error "Download failed: '$RemotePath'."
-}
+}

src/Installers/Windows/WindowsInstallers.proj

@@ -20,7 +20,6 @@
     <InstallerProject Include="SharedFrameworkBundle/SharedFrameworkBundle.wixproj" AdditionalProperties="Platform=x86" />
 
     <InstallerProject Include="*/*.wixproj" Exclude="@(InstallerProject);ancm/**/*" />
-
   </ItemGroup>
 
   <Target Name="Build">