Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Merge release/2.0.0-MSRC into release/2.0.0 #8017

Merged
merged 37 commits into from
Nov 15, 2017

Conversation

livarcocc
Copy link

Clean merge.

MattGal and others added 30 commits August 30, 2017 22:05
… download

Allow non-anonymous storage account access for .lzma download
* release/2.0.0: (49 commits)
  Keeping the branding for release/2.0.0 at 2.0.3.
  Moving the runtime version to 2.0.0 for the SDK.
  MSBuild 15.5.113
  Update F# compiler
  Remove CscToolPath
  Improve the way Roslyn is pulled in
  MSBuild 15.5.110
  Update XLFs
  Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
  Updating the branding to 15.5.
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  ...
Fixing the expected runtime version by the tool tests.
…ownload those from protected locations when needed.
… so that we can download

Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
…y, skip native installer tests when using a pre-release runtime.
…as well. Basically, skip

Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
…ild 120

Update aspnetcore runtime store and LZMA to 2.0.3 build 120.

The nupkgs for the templates and runtime are in dotnetbuilddropsmsrc/msrc-2-0-aspnet-20171018
…time store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
Update aspnetcore to 2.0.3 build 123.

Also, new packages are in dotnetbuilddropsmsrc/**msrc-2-0-aspnet-20171024**
Update aspnetcore to 2.0.3 build 124

@<[email protected]> the new packages are in dotnetbuilddropsmsrc/**msrc-2-0-aspnet-20171027**

Wait for @<[email protected]> 's signoff too. I believe he still needs to double check the assets in the dontetclimsrc blob store.
Update aspnetcore to 2.0.3 build 125

New packages are in dotnetbuilddropsmsrc/msrc-2-0-aspnet-20171031

Fingers crossed this is actually our last aspnetcore update for 2.0.3
* release/2.0.0:
  Update F# compiler to match VS
  update fsharp compiler for preview release
  Defining the published Nupkgs in one place.
  Adding the second CLI NuPkg
  Make the uploads to blob storage more exacting.
  Enabling the publish of CLI NuPkg to the unified Transport feed.
livarcocc and others added 6 commits November 8, 2017 14:31
Update SDK to 2.0.2-vspre-20170927-1.
Updating SDK to 2.0.3-servicing-20171109-3
* release/2.0.0-MSRC:
  Updating SDK to 2.0.3-servicing-20171109-3
  Update SDK to 2.0.2-vspre-20170927-1.
  Update aspnetcore to 2.0.3 build 125
  Update aspnetcore to 2.0.3 build 124
  Update aspnetcore to 2.0.3 build 123
  Updating branding to 2.0.3, again
  Fixing closing tags in the DEB and RPM targets.
  Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now.
  Update aspnetcore runtime store and LZMA to 2.0.3 build 120
  Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
  Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
  Fixing the expected runtime version by the tool tests.
  Updating the runtime version.
  Updating the branding to 15.5.1
  Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM.
  Merged PR 82801: Allow non-anonymous storage account access for .lzma download
@livarcocc livarcocc requested a review from a team November 14, 2017 20:57
@livarcocc livarcocc merged commit 9e724ed into dotnet:release/2.0.0 Nov 15, 2017
@livarcocc livarcocc deleted the merge_2_0_0_MSRC branch November 15, 2017 17:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants