This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Adding MigrateWebSdkRule to the DefaultMigrationRuleSet - #4963
#4963Merged
TheRealPiotrP merged 3 commits intoDec 8, 2016
dotnet:rel/1.0.0-preview4dotnet/cli:rel/1.0.0-preview4from
livarcocc:migrate_web_sdk_rulelivarcocc/cli-1:migrate_web_sdk_ruleCopy head branch name to clipboard
Merged
Adding MigrateWebSdkRule to the DefaultMigrationRuleSet#4963TheRealPiotrP merged 3 commits intodotnet:rel/1.0.0-preview4dotnet/cli:rel/1.0.0-preview4from livarcocc:migrate_web_sdk_rulelivarcocc/cli-1:migrate_web_sdk_ruleCopy head branch name to clipboard
TheRealPiotrP merged 3 commits into
dotnet:rel/1.0.0-preview4dotnet/cli:rel/1.0.0-preview4from
livarcocc:migrate_web_sdk_rulelivarcocc/cli-1:migrate_web_sdk_ruleCopy head branch name to clipboard
Conversation
…E2E test to cover it.
TheRealPiotrP
suggested changes
Dec 8, 2016
TheRealPiotrP
left a comment
There was a problem hiding this comment.
Let's make sure that the web project builds. I want to be sure we don't need to fix this again.
|
|
||
| var csProj = Path.Combine(projectDirectory, $"{new DirectoryInfo(projectDirectory).Name}.csproj"); | ||
|
|
||
| File.ReadAllText(csProj).Should().Contain(@"Sdk=""Microsoft.NET.Sdk.Web"""); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| var projectJson = JObject.Parse(File.ReadAllText(projectJsonFile)); | ||
| projectJson.Remove("tools"); | ||
| File.WriteAllText(projectJsonFile, projectJson.ToString()); | ||
| WriteGlobalJson(globalDirectory); |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
…ause those are included in the Web Sdk already.
TheRealPiotrP
approved these changes
Dec 8, 2016
TheRealPiotrP
left a comment
There was a problem hiding this comment.
Let's limit the removed items by type, then LGTM.
|
@dotnet-bot test RHEL7.2 x64 Release Build please. |
|
@dotnet-bot test Windows_NT x64 Release Build please |
|
@dotnet-bot test CentOS7.1 x64 Debug Build please. |
|
@dotnet-bot test RHEL7.2 x64 Release Build please. |
|
@dotnet-bot test CentOS7.1 x64 Debug Build please. |
1 similar comment
|
@dotnet-bot test CentOS7.1 x64 Debug Build please. |
|
Yes, sounds like we need to take this. |
Author
|
@dotnet-bot test CentOS7.1 x64 Debug Build please. |
|
|
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
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.
Fixes https://github.com/dotnet/cli/issues/4962.
@piotrpMSFT @jgoshi @krwq
@MattGertz for approval.