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

MSBuild to 15.1.458 #4950

Merged
merged 1 commit into from
Dec 7, 2016

Conversation

rainersigwald
Copy link
Member

This version of MSBuild has an additional fix for dotnet/msbuild#1445. I spoke to @AndyGerlicher about this and we believe that the current migration code in CLI will not hit the bug, so it's not imperative that this be taken for RC2. However, if you're going to need to take a new CLI to VS, it is probably worth taking the fix just in case (and for consistency).

The change was shiproom approved for VS insertion.

@dnfclas
Copy link

dnfclas commented Dec 7, 2016

Hi @rainersigwald, I'm your friendly neighborhood .NET Foundation Pull Request Bot (You can call me DNFBOT). Thanks for your contribution!
You've already signed the contribution license agreement. Thanks!

The agreement was validated by .NET Foundation and real humans are currently evaluating your PR.

TTYL, DNFBOT;

@livarcocc
Copy link

@dotnet-bot Test this please

@livarcocc
Copy link

@mmitche I noticed that OSX is not longer in the list above. I see it in our netci.groovy file. Can you help figure out what is going on?

@mmitche
Copy link
Member

mmitche commented Dec 7, 2016

@livarcocc The lab is being moved right now. Did you get the mail sent to netciuser? Should be available by EOD.

@TheRealPiotrP
Copy link

@dotnet-bot test RHEL7.2 x64 Release Build please.

@TheRealPiotrP
Copy link

@MattGertz

@TheRealPiotrP
Copy link

@dotnet-bot test RHEL7.2 x64 Release Build please.

@TheRealPiotrP TheRealPiotrP merged commit 5b0801c into dotnet:rel/1.0.0-preview4 Dec 7, 2016
@rainersigwald rainersigwald deleted the msbuild-458 branch December 7, 2016 20:42
livarcocc added a commit to livarcocc/cli-1 that referenced this pull request Dec 8, 2016
* rel/1.0.0-preview4:
  Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (dotnet#4963)
  MSBuild to 15.1.458 (dotnet#4950)
  Update web template for Web SDK 154 (dotnet#4948)
  Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of NuGet/Home#4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.
  remove unused directories from bundled sdks
  fix mstest package version, aligned to c#
  align f# web template
  align f# xunit template
  align f# mstest template
  align f# lib template
  align f# console proj
  bundle fsharp sdk, only Sdk directory is required
  Add more xlf files for new strings
  Updating the preview4 channel to rel-1.0.0-preview4
TheRealPiotrP pushed a commit that referenced this pull request Dec 9, 2016
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of NuGet/Home#4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (#4948)

* Update WebSDK version

* Update web template to get rid of globs

aspnet/Templates#735

* MSBuild to 15.1.458 (#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
mlorbetske pushed a commit to mlorbetske/cli that referenced this pull request Dec 18, 2016
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of NuGet/Home#4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (dotnet#4948)

* Update WebSDK version

* Update web template to get rid of globs

aspnet/Templates#735

* MSBuild to 15.1.458 (dotnet#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (dotnet#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants