mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Changes per code review...

Browse source
This commit is contained in:
John Beisner 2017-12-01 08:05:33 -08:00
parent 3d39772fe9
commit b092ad0141
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/AzureInfo.props
View file

@ -3,8 +3,7 @@
<Product>Sdk</Product> <Product>Sdk</Product>
<CoreSetupBlobRootUrl>$(PB_AssetRootUrl)</CoreSetupBlobRootUrl> <CoreSetupBlobRootUrl>$(PB_AssetRootUrl)</CoreSetupBlobRootUrl>
<CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl> <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
<CoreSetupBlobAccessToken>$(PB_AssetRootAccessTokenSuffix)</CoreSetupBlobAccessToken> <CoreSetupBlobAccessTokenParam Condition=" '$(PB_AssetRootAccessTokenSuffix)' != '' ">?$(CoreSetupBlobAccessToken)</CoreSetupBlobAccessTokenParam>
<CoreSetupBlobAccessTokenParam Condition=" '$(CoreSetupBlobAccessToken)' != '' ">?$(CoreSetupBlobAccessToken)</CoreSetupBlobAccessTokenParam>
<ArtifactContainerName>$(ARTIFACT_STORAGE_CONTAINER)</ArtifactContainerName> <ArtifactContainerName>$(ARTIFACT_STORAGE_CONTAINER)</ArtifactContainerName>
<ArtifactContainerName Condition="'$(ArtifactContainerName)' == ''">dotnet</ArtifactContainerName> <ArtifactContainerName Condition="'$(ArtifactContainerName)' == ''">dotnet</ArtifactContainerName>
<ArtifactCloudDropAccessToken>$(ARTIFACT_STORAGE_KEY)</ArtifactCloudDropAccessToken> <ArtifactCloudDropAccessToken>$(ARTIFACT_STORAGE_KEY)</ArtifactCloudDropAccessToken>

1
build/BundledRuntimes.props
View file

@ -27,7 +27,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">$(AssetDownloadRootUrl)/dotnet/</CoreSetupBlobRootUrl>
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl> <CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
<CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)</CoreSetupDownloadDirectory> <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)</CoreSetupDownloadDirectory>
<CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive> <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>

9
scripts/dockerrun.sh
View file

@ -119,14 +119,20 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
--name $DOTNET_BUILD_CONTAINER_NAME \ --name $DOTNET_BUILD_CONTAINER_NAME \
-v $DOCKER_HOST_SHARE_DIR:/opt/code \ -v $DOCKER_HOST_SHARE_DIR:/opt/code \
-e CHANNEL \ -e CHANNEL \
-e CONNECTION_STRING \
-e REPO_ID \ -e REPO_ID \
-e REPO_USER \ -e REPO_USER \
-e REPO_PASS \
-e REPO_SERVER \ -e REPO_SERVER \
-e DOTNET_BUILD_SKIP_CROSSGEN \ -e DOTNET_BUILD_SKIP_CROSSGEN \
-e PUBLISH_TO_AZURE_BLOB \ -e PUBLISH_TO_AZURE_BLOB \
-e NUGET_FEED_URL \ -e NUGET_FEED_URL \
-e NUGET_API_KEY \
-e GITHUB_PASSWORD \
-e ARTIFACT_STORAGE_KEY \
-e ARTIFACT_STORAGE_ACCOUNT \ -e ARTIFACT_STORAGE_ACCOUNT \
-e ARTIFACT_STORAGE_CONTAINER \ -e ARTIFACT_STORAGE_CONTAINER \
-e CHECKSUM_STORAGE_KEY \
-e CHECKSUM_STORAGE_ACCOUNT \ -e CHECKSUM_STORAGE_ACCOUNT \
-e CHECKSUM_STORAGE_CONTAINER \ -e CHECKSUM_STORAGE_CONTAINER \
-e CLIBUILD_SKIP_TESTS \ -e CLIBUILD_SKIP_TESTS \
@ -135,7 +141,10 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
-e RELEASESUFFIX \ -e RELEASESUFFIX \
-e COREFXAZURECONTAINER \ -e COREFXAZURECONTAINER \
-e AZUREACCOUNTNAME \ -e AZUREACCOUNTNAME \
-e AZUREACCESSTOKEN \
-e VSOPASSWORD \
-e RELEASETOOLSGITURL \ -e RELEASETOOLSGITURL \
-e CORESETUPBLOBROOTURL \ -e CORESETUPBLOBROOTURL \
-e CORESETUPBLOBACCESSTOKEN \
$DOTNET_BUILD_CONTAINER_TAG \ $DOTNET_BUILD_CONTAINER_TAG \
$BUILD_COMMAND "$@" $BUILD_COMMAND "$@"