Skip to content
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
merged 36 commits into from
Feb 15, 2018
Merged

Merge release/2.1.3xx to master #8609

merged 36 commits into from
Feb 15, 2018

Commits on Feb 8, 2018

  1. MSBuild 15.6.80

    @AndyGerlicher
    AndyGerlicher committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    e0d138e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8565 from AndyGerlicher/MSBuild15.6.80 

    MSBuild 15.6.80
    Livar authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    dd7664e View commit details
    Browse the repository at this point in the history

  3. Update SDK to 2.1.300-preview1-62608-07

    @livarcocc
    Livar authored and livarcocc committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    73dbe8f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8571 from dotnet/update_sdk 

    Update SDK to 2.1.300-preview1-62608-06
    Livar authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    60614db View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2018

  1. MSBuild 15.6.81

    @rainersigwald
    rainersigwald committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    eecb8f6 View commit details
    Browse the repository at this point in the history

  2. Fixing update dependency by using the new APIs. We broke this when we… 

    … updated the version of VersionTools.
    @livarcocc
    Livar Cunha authored and livarcocc committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    9789573 View commit details
    Browse the repository at this point in the history

  3. Adding roslyn to automatic dependency flow through maestro.

    @livarcocc
    Livar Cunha authored and livarcocc committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    43b84cf View commit details
    Browse the repository at this point in the history

  4. Insert NuGet Build 4.6.0-rtm-4918 into cli

    @nugetlurker
    nugetlurker committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    6003685 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8578 from livarcocc/port_update_dependencies_change 

    Port update dependencies change
    Livar authored Feb 9, 2018
    Configuration menu
    Copy the full SHA
    442881f View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

  1. Consume generic aspnetcore rpm installers

    = committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    932248f View commit details
    Browse the repository at this point in the history

  2. Do not create a directory with a trailing space; it cannot be deleted… 

    … by conventional methods. (#8587)
    @johnbeisner
    johnbeisner authored Feb 10, 2018
    Configuration menu
    Copy the full SHA
    82f9d6e View commit details
    Browse the repository at this point in the history

  3. Port Kernel Version telemetry to preview1

    @danmoseley
    danmoseley committed Feb 10, 2018
    Configuration menu
    Copy the full SHA
    aa90d8e View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2018

  1. Merge pull request #8582 from dotnet/johluo/generic-rpms 

    Consume generic aspnetcore rpm installers
    Livar authored Feb 11, 2018
    Configuration menu
    Copy the full SHA
    3d9df22 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8588 from danmosemsft/port8579.to.2.1preview 

    Port Kernel Version telemetry to preview1
    Livar authored Feb 11, 2018
    Configuration menu
    Copy the full SHA
    72d9c0f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8580 from dotnet/nuget.client.release-4918-1-1 

    Insert NuGet Build 4.6.0-rtm-4918 into cli
    Livar authored Feb 11, 2018
    Configuration menu
    Copy the full SHA
    04dc2d1 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Merge pull request #8575 from rainersigwald/msbuild-15.6.81 

    MSBuild 15.6.81
    Livar authored Feb 12, 2018
    Configuration menu
    Copy the full SHA
    0468da6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8591 from dotnet/merges/release/2.1.1xx-to-releas… 

    …e/2.1.2xx

Merge release/2.1.1xx to release/2.1.2xx
    Livar authored Feb 12, 2018
    Configuration menu
    Copy the full SHA
    be8e1ed View commit details
    Browse the repository at this point in the history

  3. Support TildeSlash expand (#8589)

    William Lee authored Feb 12, 2018
    Configuration menu
    Copy the full SHA
    2a493c1 View commit details
    Browse the repository at this point in the history

  4. Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx

    @nguerrera
    nguerrera committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    8fcbb63 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Use satellites from roslyn package, not cli-deps-satellites

    @nguerrera
    nguerrera committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    bc1fb44 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8595 from nguerrera/update-roslyn-2.1.1xx 

    Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx
    @nguerrera
    nguerrera authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    8265c55 View commit details
    Browse the repository at this point in the history

  3. Signing nupkg contents (Cli.Utils and MSBuildResolver) along with the… 

    … rest of the compiled assemblies.
    @livarcocc
    livarcocc committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    423c407 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8597 from dotnet/merges/release/2.1.1xx-to-releas… 

    …e/2.1.2xx

Merge release/2.1.1xx to release/2.1.2xx
    Livar authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    ced1f50 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release… 

    …/2.1.3xx
    Livar authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    44229ea View commit details
    Browse the repository at this point in the history

  6. Merge pull request #8598 from dotnet/merges/release/2.1.2xx-to-releas… 

    …e/2.1.3xx

Merge release/2.1.2xx to release/2.1.3xx
    Livar authored Feb 13, 2018
    Configuration menu
    Copy the full SHA
    243a26e View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Merge pull request #8601 from livarcocc/sign_all_assemblies 

    Signing nupkg contents (Cli.Utils and MSBuildResolver)
    Livar authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    6d50f8c View commit details
    Browse the repository at this point in the history

  2. "ExternalRestoreSources" needs to be set in the docker container (#8602) 

    * 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.
    @johnbeisner
    johnbeisner authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    e6cdfeb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8607 from dotnet/merges/release/2.1.1xx-to-releas… 

    …e/2.1.2xx

Merge release/2.1.1xx to release/2.1.2xx
    Livar authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    0b7f66c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8608 from dotnet/merges/release/2.1.2xx-to-releas… 

    …e/2.1.3xx

Merge release/2.1.2xx to release/2.1.3xx
    Livar authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    73963e8 View commit details
    Browse the repository at this point in the history

  5. Update to aspnetcore 2.1.0-preview1-28275 and react to feed layout ch… 

    …anges (#8611)
    @natemcmaster @johnbeisner
    natemcmaster authored and johnbeisner committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    62ce305 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/rel… 

    …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
    @livarcocc
    livarcocc committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    7e32b9a View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. Merge pull request #8612 from dotnet/merges/release/2.1.2xx-to-releas… 

    …e/2.1.3xx

Merge release/2.1.2xx to release/2.1.3xx
    Livar authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    34da66f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/rel… 

    …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
    livarcocc committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    f19b3fd View commit details
    Browse the repository at this point in the history

  3. Update ASP.NET version to 2.1.0-preview2-30106

    @livarcocc
    Livar authored and livarcocc committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    4810eff View commit details
    Browse the repository at this point in the history

  4. Updating the lzma to use the new asp.net runtime location.

    @livarcocc
    livarcocc committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    d823581 View commit details
    Browse the repository at this point in the history

  5. Fixing the URLs for the msbuildscript.tests to use the new asp.net ru… 

    …ntime folder as well.
    @livarcocc
    livarcocc committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    3f2bdcf View commit details
    Browse the repository at this point in the history