This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Merge release/2.1.3xx to master #8609
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MSBuild 15.6.80
Update SDK to 2.1.300-preview1-62608-06
… updated the version of VersionTools.
Port update dependencies change
… by conventional methods. (#8587)
Consume generic aspnetcore rpm installers
Port Kernel Version telemetry to preview1
Insert NuGet Build 4.6.0-rtm-4918 into cli
MSBuild 15.6.81
…e/2.1.2xx Merge release/2.1.1xx to release/2.1.2xx
Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
… rest of the compiled assemblies.
…e/2.1.2xx Merge release/2.1.1xx to release/2.1.2xx
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
Signing nupkg contents (Cli.Utils and MSBuildResolver)
* Add "PB_RESTORESOURCE" to docker environmental variables. * Add "PB_RestoreSource" explictly to the 'SandBox' build.sh call. * Add "ExternalRestoreSources" explictly to the 'SandBox' build.sh call. * Using an environmental variable to communicate to the docker container.
…e/2.1.2xx Merge release/2.1.1xx to release/2.1.2xx
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
livarcocc
approved these changes
Feb 14, 2018
|
@dotnet-bot Test RHEL7.2 x64 Release Build |
…ease/2.1.2xx-to-release/2.1.3xx * dotnet/release/2.1.2xx: Use satellites from roslyn package, not cli-deps-satellites Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx Conflicts: build/DependencyVersions.props src/redist/redist.csproj src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
|
@natemcmaster This is failing to find the asp.net runtime when going into master. Can you take a look? Is this a asp.net version problem? |
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
|
yes, we'll need a newer version of aspnet that has the rhel7.rpm rename. Give version 2.1.0-preview2-30106 a shot. It should exist |
|
Oh, and you'll also need the changes I added here to adjust the layout. See #8611 |
…ease/2.1.3xx-to-master * dotnet/release/2.1.3xx: Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout changes (#8611) "ExternalRestoreSources" needs to be set in the docker container (#8602) Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the rest of the compiled assemblies. Use satellites from roslyn package, not cli-deps-satellites Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx Support TildeSlash expand (#8589) Port Kernel Version telemetry to preview1 Do not create a directory with a trailing space; it cannot be deleted by conventional methods. (#8587) Consume generic aspnetcore rpm installers Insert NuGet Build 4.6.0-rtm-4918 into cli Adding roslyn to automatic dependency flow through maestro. Fixing update dependency by using the new APIs. We broke this when we updated the version of VersionTools. MSBuild 15.6.81 Update SDK to 2.1.300-preview1-62608-07 MSBuild 15.6.80 Conflicts: build/DependencyVersions.props test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs
livarcocc
force-pushed
the
merges/release/2.1.3xx-to-master
branch
from
ddff156
to
f19b3fd
Compare
livarcocc
approved these changes
Feb 15, 2018
livarcocc
force-pushed
the
merges/release/2.1.3xx-to-master
branch
from
1642031
to
4810eff
Compare
natemcmaster
approved these changes
Feb 15, 2018
| @@ -1,10 +1,10 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | |||
| <PropertyGroup> | |||
| <MicrosoftAspNetCoreAllPackageVersion>2.1.0-preview2-30057</MicrosoftAspNetCoreAllPackageVersion> | |||
| <MicrosoftAspNetCoreAppPackageVersion>2.1.0-preview2-30106</MicrosoftAspNetCoreAppPackageVersion> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatically generated pull request from release/2.1.3xx into master.
git fetch --all git checkout merges/release/2.1.3xx-to-master git reset --hard upstream/master git merge upstream/release/2.1.3xx # Fix merge conflicts git commit git push merges/release/2.1.3xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.