huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch release/2.0 into release/2.0-msrc

This commit is contained in:
Nate McMaster 2018-04-18 10:10:52 -07:00
parent 0ec30bf94d de692a6afe
commit 20533d0510
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/RuntimeStoreInstaller.targets
View File

@ -462,13 +462,14 @@
-e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -e DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-e INSTALLER_NAME=$(DebPrefix)-$(DebVersion) -e INSTALLER_NAME=$(DebPrefix)-$(DebVersion)
-e INSTALLER_VERSION=$(DebVersion) -e INSTALLER_VERSION=$(DebVersion)
-e 'KOREBUILD_DOTNET_VERSION=$(KOREBUILD_DOTNET_VERSION)' -e KOREBUILD_DOTNET_VERSION
-e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)' -e KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION
-e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)' -e KOREBUILD_DOTNET_FEED_CDN
-e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)' -e KOREBUILD_DOTNET_FEED_UNCACHED
-e "KOREBUILD_DOTNET_FEED_CREDENTIAL=$KOREBUILD_DOTNET_FEED_CREDENTIAL" -e KOREBUILD_DOTNET_FEED_CREDENTIAL
-e DotNetAssetRootAccessTokenSuffix
docker-image-$(Image) docker-image-$(Image)
./build.sh /t:RunDebTool '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)' '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)'" ./build.sh /t:RunDebTool '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)'"
ContinueOnError="WarnAndContinue" /> ContinueOnError="WarnAndContinue" />
<!-- Copy Runtime Store and Hosting Bundle packages to output --> <!-- Copy Runtime Store and Hosting Bundle packages to output -->