diff options
| author | Nate McMaster <nate.mcmaster@microsoft.com> | 2018-04-25 01:37:35 +0300 |
|---|---|---|
| committer | Nate McMaster <nate.mcmaster@microsoft.com> | 2018-04-25 01:37:35 +0300 |
| commit | aa2fe88af79ae7f0cc476317ce979566995247c1 (patch) | |
| tree | 6a1c7ad6ff9519e0d3f2717b634d480b9829ffcd | |
| parent | 538c8ccb20bad6f20f602d04934c1bc0d43d4aa1 (diff) | |
| parent | 5f3d3d1aea786465e224721165ed24a254034fa9 (diff) | |
Merge branch 'release/2.1' into release/2.1-msrc
| -rw-r--r-- | build/RepositoryBuild.targets | 2 | ||||
| -rw-r--r-- | build/repo.props | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 987334ee0c..f4ac942283 100644 --- 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 index d65dc3a215..8cb137114d 100644 --- 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 --> |