This repository has been archived by the owner on Apr 20, 2023. It is now read-only.
Merge rel/1.0.0-preview4 back into rel/1.0.0 #4974
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
Add more xlf files for new strings
Updating the preview4 channel to rel-1.0.0-preview4
…ackages 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.
…ackages Adding a SdkNugetVersion property when invoking dotnet pack on test packages
…te_p4 use Sdk attribute in F# templates too (branch preview4)
* Update WebSDK version * Update web template to get rid of globs aspnet/Templates#735
* 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
* 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
|
@dotnet-bot Test CentOS7.1 x64 Debug Build |
|
@dotnet-bot Test Windows_NT x64 Release Build |
TheRealPiotrP
approved these changes
Dec 9, 2016
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.
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.
@piotrpMSFT @krwq @jgoshi