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

Workaround issues with MSBuild variable subtitution and bash

This commit is contained in:
Nate McMaster 2017-10-17 16:32:12 -07:00
parent 4bb84cf6d0
commit b191fc8fef
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/RuntimeStoreInstaller.targets
View File

@ -32,8 +32,7 @@
<Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/> <Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/>
<PropertyGroup> <PropertyGroup>
<RuntimeTargzLink>$(CoreFeedPrefix)/dotnet/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz</RuntimeTargzLink> <RuntimeTargzLink>$(CoreFeedPrefix)/Runtime/$(MicrosoftNETCoreApp20PackageVersion)/dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz</RuntimeTargzLink>
<RuntimeTargzLink Condition="'$(KOREBUILD_DOTNET_FEED_CREDENTIAL)' != ''">$(RuntimeTargzLink)$(KOREBUILD_DOTNET_FEED_CREDENTIAL)</RuntimeTargzLink>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -52,7 +51,12 @@
<Target Name="_DownloadCoreInstallers"> <Target Name="_DownloadCoreInstallers">
<!-- Download dotnet installers --> <!-- Download dotnet installers -->
<MakeDir Directories="$(_CoreInstallerSource)" /> <MakeDir Directories="$(_CoreInstallerSource)" />
<Exec Command="curl &quot;$(RuntimeTargzLink)&quot; -o $(_CoreInstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz" /> <!--
Note: KOREBUILD_DOTNET_FEED_CREDENTIAL is intentionally NOT an MSBuild variable.
MSBuild doesn't to the substitution correctly because the string contains %,
so we'll let bash do it instead.
-->
<Exec Command="curl --fail -sSL &quot;$(RuntimeTargzLink)$KOREBUILD_DOTNET_FEED_CREDENTIAL&quot; -o $(_CoreInstallerSource)dotnet-runtime-$(MicrosoftNETCoreApp20PackageVersion)-linux-x64.tar.gz" />
</Target> </Target>
<Target Name="_GenerateTargz"> <Target Name="_GenerateTargz">
@ -133,11 +137,6 @@
<Exec Command="docker run <Exec Command="docker run
--rm --rm
-v $(RepositoryRoot):$(_DockerRootDirectory) -v $(RepositoryRoot):$(_DockerRootDirectory)
-e 'KOREBUILD_DOTNET_VERSION=$(KOREBUILD_DOTNET_VERSION)'
-e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)'
-e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)'
-e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)'
-e 'KOREBUILD_DOTNET_FEED_CREDENTIAL=$(KOREBUILD_DOTNET_FEED_CREDENTIAL)'
docker-image-$(Image) docker-image-$(Image)
fpm fpm
--verbose --verbose
@ -326,6 +325,13 @@
<RepoTasks.ReplaceInFile Filename="$(_WorkLayoutDir)debian_config.json" Items="@(DebConfigItems)" /> <RepoTasks.ReplaceInFile Filename="$(_WorkLayoutDir)debian_config.json" Items="@(DebConfigItems)" />
<!-- Build Runtime Store and Hosting Bundle Deb package --> <!-- Build Runtime Store and Hosting Bundle Deb package -->
<!--
Note: KOREBUILD_DOTNET_FEED_CREDENTIAL is intentionally NOT an MSBuild variable.
MSBuild doesn't to the substitution correctly because the string contains %,
so we'll let bash do it instead.
-->
<Exec Command="docker run <Exec Command="docker run
--rm --rm
-v $(RepositoryRoot):$(_DockerRootDirectory) -v $(RepositoryRoot):$(_DockerRootDirectory)
@ -336,7 +342,7 @@
-e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)' -e 'KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION=$(KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)'
-e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)' -e 'KOREBUILD_DOTNET_FEED_CDN=$(KOREBUILD_DOTNET_FEED_CDN)'
-e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)' -e 'KOREBUILD_DOTNET_FEED_UNCACHED=$(KOREBUILD_DOTNET_FEED_UNCACHED)'
-e 'KOREBUILD_DOTNET_FEED_CREDENTIAL=$(KOREBUILD_DOTNET_FEED_CREDENTIAL)' -e &quot;KOREBUILD_DOTNET_FEED_CREDENTIAL=$KOREBUILD_DOTNET_FEED_CREDENTIAL&quot;
docker-image-$(Image) docker-image-$(Image)
./build.sh /t:RunDebTool" ./build.sh /t:RunDebTool"
ContinueOnError="WarnAndContinue" /> ContinueOnError="WarnAndContinue" />