Merge pull request #182 from crummel/arpowFixup

A couple additional fixes for arcade-powered source-build

.vsts-ci.yml

@@ -42,6 +42,21 @@ phases:
             _PublishType: blob
             _SignType: real
 
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    agentOs: Linux_Source_Build
+    queue:
+      name: DotNetCore-Linux
+      parallel: 2
+      matrix:
+        Build_Release:
+          _BuildConfig: Release
+          _PublishType: none
+          _SignType: real
+    variables:
+      _PREVIEW_VSTS_DOCKER_IMAGE: microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20170319080304
+    enableSourceBuild: true
+
 - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
   - template: /eng/build.yml
     parameters:
@@ -65,7 +80,7 @@ phases:
     parameters:
       agentOs: Darwin
       queue: 
-        name: DotNetCore-Mac
+        name: Hosted macOS
         parallel: 2
         matrix:
           Build_Debug:

NuGet.config

@@ -3,5 +3,6 @@
   <!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->->
   <packageSources>
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
   </packageSources>
 </configuration>

eng/SourceBuild.props

@@ -5,19 +5,4 @@
     <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
   </PropertyGroup>
 
-  <Target Name="ApplySourceBuildPatchFiles"
-          Condition="
-            '$(ArcadeBuildFromSource)' == 'true' and
-            '$(ArcadeInnerBuildFromSource)' == 'true'"
-          BeforeTargets="Execute">
-    <ItemGroup>
-      <SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
-    </ItemGroup>
-
-    <Exec
-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
-      WorkingDirectory="$(RepoRoot)"
-      Condition="'@(SourceBuildPatchFile)' != ''" />
-  </Target>
-
 </Project>

eng/Version.Details.xml

@@ -3,10 +3,15 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19207.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21278.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b1f9e12fe3ee71c48ea60b15968745850ac0a4a7</Sha>
+      <Sha>b5ca0997b26992dcc4e55ec3d87d71000be295ce</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="5.0.0-alpha.1.20473.1">
+      <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
+      <Sha>def2e2c6dc5064319250e2868a041a3dc07f9579</Sha>
+      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/build.yml

@@ -61,7 +61,7 @@ phases:
           PublishType: $(_PublishType)
 
     - ${{ if ne(parameters.agentOs, 'Windows_NT') }}:
-      - script: eng/common/cibuild.sh 
+      - script: eng/cibuild.sh
                   --configuration $BuildConfig
                   $(_PublishArgs)
                   $(_SignArgs)

eng/cibuild.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where 
+  # the symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
+# install the 2.1.0 runtime for running tests
+"$scriptroot/common/dotnet-install.sh"  -runtime dotnet -version 2.1.0
+
+. "$scriptroot/common/cibuild.sh" --restore --build --test --pack --publish --ci $@

src/tests/CommandLine.Tests/Microsoft.DotNet.Cli.CommandLine.Tests.csproj

@@ -4,6 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <PropertyGroup>

src/xamples/SampleParsers/CommandLine.SampleParsers.csproj

@@ -6,6 +6,7 @@
     <OutputType>Library</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsShipping>false</IsShipping>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <PropertyGroup>

src/xamples/dotnet/dotnet.csproj

@@ -6,6 +6,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsShipping>false</IsShipping>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <PropertyGroup>