diff --git a/NuGet.Config b/NuGet.Config index 95416b2f1..09a1c2c1e 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -5,7 +5,6 @@ - @@ -18,5 +17,6 @@ + diff --git a/build/AzureInfo.props b/build/AzureInfo.props index 8877694e2..0d85869ee 100644 --- a/build/AzureInfo.props +++ b/build/AzureInfo.props @@ -14,6 +14,8 @@ dotnetclichecksums $(TRANSPORTFEED_STORAGE_CONTAINER) dotnet-core + $(TRANSPORTFEED_EXPECTED_URL) + https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json $(TRANSPORTFEED_STORAGE_KEY) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 94cee04ee..7b30af2ef 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -4,9 +4,8 @@ - - - - + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 214059957..0df9c0e91 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,9 +1,9 @@ - 2.1.0-preview1-25929-02 - 15.5.0-preview-000178-1116824 - 2.6.0-beta2-62210-01 + 2.1.0-preview1-26001-02 + 15.6.0-preview-000012-1193158 + 2.6.0-beta3-62309-01 1.6.0-beta2-25304 4.2.0-rtm-171122-0 pre-20171012-1 @@ -16,7 +16,7 @@ 2.1.0-preview1-20171121-1 $(CLI_NETSDK_Version) - 4.5.0-preview2-4529 + 4.5.0-rtm-4651 2.0.1-servicing-25908-02 2.0.0-rel-20171110-671 15.5.0 @@ -27,14 +27,14 @@ 1.0.0-beta3-20171117-314 1.0.0-beta3-20171117-314 1.0.0-beta2-20171004-309 - 2.1.0-preview1-25929-02 - 2.1.0-preview1-25929-02 + 2.1.0-preview1-26001-02 + 2.1.0-preview1-26001-02 0.1.1-alpha-174 1.2.1-alpha-002133 0.2.0 - 1.0.417 0.2.0-beta-000042 0.2.0-beta-000059 + 2.0.3 aspnetcore-store dev-26623 2.1.0-preview1-26623 @@ -44,5 +44,6 @@ 1.0.27-prerelease-01723-01 2.0.0-preview2-25331-01 + 1.0.0-prerelease-02203-01 diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index d733ad10a..552ed1b34 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -25,7 +25,6 @@ - diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index b38315825..c3e7d2b0b 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -2,10 +2,12 @@ + + ?$(CoreSetupBlobAccessToken) $(SdkOutputDirectory)/nuGetPackagesArchive.lzma nuGetPackagesArchive-$(AspNetCoreRuntimePackageVersion).lzma $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName) + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index 4bf2a1030..7deaeb6da 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -176,7 +176,6 @@ $(HostFxrRpmPackageName.ToLower()) dotnet-host $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion) - $(AspNetCoreRuntimePackageVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreRuntimePackageVersion)-$(HostRid).rpm $(ScriptsDir)/$(AfterInstallHostScriptName) $(RpmLayoutScripts)/$(AfterInstallHostScriptName) @@ -193,7 +192,7 @@ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) diff --git a/build/publish/PublishNupkgToTransportFeed.targets b/build/publish/PublishNupkgToTransportFeed.targets index 10352ac83..19dd03e71 100644 --- a/build/publish/PublishNupkgToTransportFeed.targets +++ b/build/publish/PublishNupkgToTransportFeed.targets @@ -1,22 +1,20 @@ + + - - https://dotnetfeed.blob.core.windows.net/$(TransportFeedContainerName)/index.json - - - + + - diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 373110a44..e18939f5e 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -30,7 +30,7 @@ - + diff --git a/scripts/cli-test-env.sh b/scripts/cli-test-env.sh old mode 100644 new mode 100755 diff --git a/scripts/docker/rhel/Dockerfile b/scripts/docker/rhel/Dockerfile index 71876a180..ec809ea73 100644 --- a/scripts/docker/rhel/Dockerfile +++ b/scripts/docker/rhel/Dockerfile @@ -4,11 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-c982313-20174116044113 - -# Install from sudo main package -RUN yum install -y https://www.sudo.ws/sudo/dist/packages/RHEL/7/sudo-1.8.20-3.el7.x86_64.rpm \ - && yum clean all +FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0