Merge branch 'release/3.1' into 3.1.7

Conflicts:
	eng/Versions.props

Author: dseefeld

build.sh

@@ -31,6 +31,16 @@ if [ -z "${HOME:-}" ]; then
     mkdir "$HOME"
 fi
 
+# If .git doesn't exist at the repo root, create it. It's required for the build to work. The very
+# prominent source tar.gz and zip files created by GitHub don't include it, so it's worth having a
+# fallback here. See https://github.com/dotnet/source-build/issues/1646 for details.
+if [ ! -e "$scriptroot/.git" ]; then
+  (
+    cd "$scriptroot"
+    git init
+  )
+fi
+
 if grep -q '\(/docker/\|/docker-\)' "/proc/1/cgroup"; then
     export DotNetRunningInDocker=1
 fi

eng/Version.Details.xml

@@ -5,9 +5,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
     </Dependency>
-    <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20278.2">
+    <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20374.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>f3db8b2a4a7c12ac44283b516dac8cda12a5edeb</Sha>
+      <Sha>a5e56cf0c92548d81ee8e3a680e6229807c93580</Sha>
     </Dependency>
   </ToolsetDependencies>
   <ProductDependencies>

eng/Versions.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <!-- Production Dependencies -->
   <PropertyGroup>
-    <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20278.2</PrivateSourceBuildReferencePackagesPackageVersion>
+    <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
     <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.106</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>

tools-local/init-build.proj

@@ -110,13 +110,14 @@
       <ReferenceAssemblyDirectories Include ="$(ReferencePackagesStagingDir)/**/*.nuspec" />
     </ItemGroup>
 
-    <MakeDir Directories="$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)" />
-    <Exec Command="$(IlasmPath) %(IlSource.Identity) -dll -quiet -nologo -output=$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)%(IlSource.Filename).dll" />
+    <MakeDir Condition="'%(IlSource.RecursiveDir)' != ''" Directories="$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)" />
+    <Exec Condition="'%(IlSource.Identity)' != ''" Command="$(IlasmPath) %(IlSource.Identity) -dll -quiet -nologo -output=$(ReferencePackagesStagingDir)%(IlSource.RecursiveDir)%(IlSource.Filename).dll" />
 
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done building reference-only assemblies." />
 
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Packing reference-only packages." />
-    <NugetPack Nuspecs="%(ReferenceAssemblyDirectories.Identity)"
+    <NugetPack Condition="'%(ReferenceAssemblyDirectories.Identity)' != ''" 
+               Nuspecs="%(ReferenceAssemblyDirectories.Identity)"
                OutputDirectory="$(ReferencePackagesDir)"
                ExcludeEmptyDirectories="false"
                CreateSymbolPackage="false" />