Merge branch 'release/2.1' into release/2.1-msrc

dotnet · Apr 24, 2018 · aa2fe88 · aa2fe88
2 parents 538c8cc + 5f3d3d1
commit aa2fe88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
@@ -76,6 +76,8 @@
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:Configuration=$(Configuration)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild)</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) /noconsolelogger '/l:RepoTasks.FlowLogger,$(MSBuildThisFileDirectory)tasks\bin\publish\RepoTasks.dll;Summary;FlowId=$(RepositoryToBuild)'</RepositoryBuildArguments>
+      <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)'</RepositoryBuildArguments>
+      <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)'</RepositoryBuildArguments>
 
       <SourceLockFile>$(RepositoryRoot)korebuild-lock.txt</SourceLockFile>
       <RepoLockFile>$(BuildRepositoryRoot)korebuild-lock.txt</RepoLockFile>

diff --git a/build/repo.props b/build/repo.props
@@ -46,9 +46,16 @@
   <ItemGroup>
     <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe -->
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
+
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
       Feed="$(DotNetAssetRootUrl)"
       FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
+
+    <DotNetCoreRuntime Condition="'$(OS)' == 'Windows_NT'"
+      Include="$(MicrosoftNETCoreApp21PackageVersion)"
+      Arch="x86"
+      Feed="$(DotNetAssetRootUrl)"
+      FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
   </ItemGroup>
 
   <!-- Properties for publishing -->