-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Adding MigrateWebSdkRule to the DefaultMigrationRuleSet #4963
Adding MigrateWebSdkRule to the DefaultMigrationRuleSet #4963
Conversation
…E2E test to cover it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. |
@dotnet-bot test CentOS7.1 x64 Debug Build please. |
* 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
* 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
* 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
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.