Merge release/2.0.0 into master #1602
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
Insert NuGet Build 4.3.0-rtm-4324 into sdk
Setting RestoreAdditionalProjectFallbackFoldersExcludes when the TFM is 1.x to prevent fallback folders from being used in that case. Note that NuGet will have to do the aggregation of these properties in order for this to work.
…t version that we need.
Adds fallback folder for full framework projects.
LOC CHECKIN | sdk-release/2.0.0 | 20170726
Free metadata reader and assembly after reading metadata
Update error message text when 2.0 SDK is required to build a project
Insert NuGet Build 4.3.0-rtm-4382 into sdk
Update version to 2.0.2-vspre
Revert "Update version to 2.0.2-vspre"
Update version to 2.0.2-vspre and update NuGet
Bump default versions for self-contained apps
Insert NuGet Build 4.4.0-preview1-4434 into sdk
Revert self-contained implicit versions to 1.0.5/1.1.2/2.0.0
This is already set in the build script, but setting it here will apply to scenarios such as running tests from VS
…unt in conflict resolution Fixes #1465
…lict resolution See dotnet/msbuild#2516 for details of the perf issue
Update support libraries to those that are only lib.
Use correct target path for runtimeTargets items when resolving conflicts
Insert NuGet Build 4.4.0-preview3-4475 into sdk
* release/2.0-vs: Update CLI version Fix test issue with path separator character Fix perf regression with setting DestinationSubPath on items for conflict resolution Add build/test environment scripts Fix satellite assembly conflict resolution when targeting .NET Core Take locale portion of target path for satellite assemblies into account in conflict resolution Add comment clarifying test expectation Change log verbosity to normal when checking whether projects encounter conflicts Use correct target path for runtimeTargets items when resolving conflicts Disable multilevel lookup for Tests Disable multilevel lookup in build/test to prevent accidental machine dependencies Insert NuGet Build 4.4.0-preview3-4475 into sdk Update support libraries to those that are only lib. Update DotnetCLIVersion fix intermediate nuspec path Insert NuGet Build 4.4.0-preview1-4434 into sdk Insert NuGet Build 4.4.0-preview1-4365 and corresponding CLI version into SDK
Merge release/2.0-vs into release/2.0.0
* release/2.0.0: (33 commits) Update CLI version Fix test issue with path separator character Fix perf regression with setting DestinationSubPath on items for conflict resolution Add build/test environment scripts Fix satellite assembly conflict resolution when targeting .NET Core Take locale portion of target path for satellite assemblies into account in conflict resolution Add comment clarifying test expectation Change log verbosity to normal when checking whether projects encounter conflicts Use correct target path for runtimeTargets items when resolving conflicts Disable multilevel lookup for Tests Disable multilevel lookup in build/test to prevent accidental machine dependencies Insert NuGet Build 4.4.0-preview3-4475 into sdk Update support libraries to those that are only lib. Revert self-contained implicit versions to 1.0.5/1.1.2/2.0.0 Update DotnetCLIVersion fix intermediate nuspec path Insert NuGet Build 4.4.0-preview1-4434 into sdk Bump default versions for self-contained apps Disable multilevel lookup in build/test to prevent accidental machine dependencies Revert "Update version to 2.0.2-vspre" ...
|
Should we merge release/2.0-vs into release/2.0.0 first?
…Sent from my Windows 10 phone
From: Livar
Sent: Monday, September 25, 2017 9:54 AM
To: dotnet/sdk
Cc: Daniel Plaisted; Team mention
Subject: [dotnet/sdk] Merge release/2.0.0 into master (#1602)
@dotnet/dotnet-cli
You can view, comment on, or merge this pull request online at:
#1602
Commit Summary
• Insert NuGet Build 4.3.0-rtm-4324 into sdk
• Merge pull request #1444 from dotnet/nuget-insertbuild4324
• Adds fallback folder for full framework projects.
• Changing the condition to not use fallback folder to trigger only on netcoreapp.
• Free metadata reader and assembly after reading metadata
• Re-enable tests and update the CLI to the one containing the new NuGet version that we need.
• Merge pull request #1409 from livarcocc/improve_fallback_folder
• LOC CHECKIN | sdk-release/2.0.0 | 20170726
• Merge pull request #1457 from v-zbsail/moravia_loc
• Add telemetry data points for .NET Core 2.0
• Merge pull request #1456 from ericstj/freeMetadata
• Update error message text when 2.0 SDK is required to build a project
• Merge pull request #1461 from dsplaisted/update-2.0-required-message
• Insert NuGet Build 4.3.0-rtm-4382 into sdk
• Bump CLI version
• Merge pull request #1472 from dotnet/nuget-insertbuild4382
• Update branding 2.0.1-servicing
• Update version to 2.0.2-vspre
• Merge pull request #1504 from dsplaisted/release/2.0-vs
• Insert NuGet Build 4.4.0-preview1-4365 and corresponding CLI version into SDK
• Revert "Update version to 2.0.2-vspre"
• Merge pull request #1505 from dotnet/revert-1504-release/2.0-vs
• Merge pull request #1506 from dsplaisted/release/2.0-vs
• Disable multilevel lookup in build/test to prevent accidental machine dependencies
• Bump default versions for self-contained apps
• Merge pull request #1519 from nguerrera/2.0-default-ver
• Insert NuGet Build 4.4.0-preview1-4434 into sdk
• fix intermediate nuspec path
• Update DotnetCLIVersion
• Merge pull request #1528 from dotnet/nuget-insertbuild4434
• Revert self-contained implicit versions to 1.0.5/1.1.2/2.0.0
• Merge pull request #1574 from nguerrera/rollback-2.0
• Update support libraries to those that are only lib.
• Insert NuGet Build 4.4.0-preview3-4475 into sdk
• Disable multilevel lookup in build/test to prevent accidental machine dependencies
• Disable multilevel lookup for Tests
• Use correct target path for runtimeTargets items when resolving conflicts
• Change log verbosity to normal when checking whether projects encounter conflicts
• Add comment clarifying test expectation
• Take locale portion of target path for satellite assemblies into account in conflict resolution
• Fix satellite assembly conflict resolution when targeting .NET Core
• Add build/test environment scripts
• Fix perf regression with setting DestinationSubPath on items for conflict resolution
• Fix test issue with path separator character
• Merge pull request #1582 from ericstj/updateNetFxNS2Bits
• Merge upstream changes
• Merge pull request #1565 from dsplaisted/1510-conflict-resolution
• Merge upstream changes
• Update CLI version
• Merge pull request #1585 from dotnet/nuget-insertbuild4475
• Merge branch 'release/2.0-vs' into merge_release20_vs
• Merge pull request #1600 from dotnet/merge_release20_vs
• Merge branch 'release/2.0.0' into merge_release200
• Pinning the SDK version to 2.0.2, because that has the right NuGet version in it.
File Changes
• M Common.props (1)
• M DotnetCLIVersion.txt (2)
• D TestAssets/TestProjects/DesktopUsingPackageWithSatellites/DesktopUsingPackageWithSatellites.csproj (12)
• D TestAssets/TestProjects/DesktopUsingPackageWithSatellites/Program.cs (15)
• M build/DependencyVersions.props (4)
• M src/Tasks/Common/Resources/Strings.resx (2)
• M src/Tasks/Common/Resources/xlf/Strings.cs.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.de.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.es.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.fr.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.it.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.ja.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.ko.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.pl.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.ru.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.tr.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf (6)
• M src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf (6)
• M src/Tasks/Common/src/ItemUtilities.cs (16)
• M src/Tasks/Microsoft.NET.Build.Extensions.Tasks/GetDependsOnNETStandard.net46.cs (10)
• M src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj (111)
• M src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.NETFramework.targets (20)
• M src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.ConflictResolution.targets (6)
• A src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.NuGetOfflineCache.targets (29)
• M src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.BeforeCommon.targets (11)
• M src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.DefaultItems.targets (42)
• M src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.TargetFrameworkInference.targets (4)
• M src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.PackageDependencyResolution.targets (19)
• M test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs (90)
• M test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWtihNetStandardLib.cs (2)
• M test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs (88)
• A test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreAppForTelemetry.cs (75)
• A test/Microsoft.NET.Build.Tests/LogTelemetryToStdOutForTest.cs (31)
• M test/Microsoft.NET.Restore.Tests/GivenThatWeWantToRestoreProjectsUsingNuGetConfigProperties.cs (18)
• M test/Microsoft.NET.TestFramework/Commands/PackCommand.cs (4)
• M test/Microsoft.NET.TestFramework/RepoInfo.cs (16)
• M test/Microsoft.NET.TestFramework/TestPackageReference.cs (5)
Patch Links:
• https://github.com/dotnet/sdk/pull/1602.patch
• https://github.com/dotnet/sdk/pull/1602.diff
—
You are receiving this because you are on a team that was mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
|
@dsplaisted did that on Friday. |
dsplaisted
reviewed
Sep 25, 2017
DotnetCLIVersion.txt
Outdated
| @@ -1 +1 @@ | |||
| 2.1.0-preview1-007041 | |||
| 2.0.2-vspre-006963 | |||
There was a problem hiding this comment.
This means we're no longer using a master version of the SDK with the master version of the CLI? Shouldn't we merge release/2.0-vs and release/2.0.0 into master in the SDK, then use that version of the SDK here? Or can we not do that right now because signing is down?
There was a problem hiding this comment.
Or can we not do that right now because signing is down?
I think that's exactly the issue. @livarcocc mentioned as much in standup today and note that f1fe4af does this deliberately post-merge.
nguerrera
approved these changes
Sep 25, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@dotnet/dotnet-cli