-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Finish localization of SDK #626
Conversation
Also move raw build task output to Raw\ subfolder to clean up the output directory structure and allow wildcarding without picking up things from tests or packages layout
We need to build with a newer SDK to correctly sign satellite assemblies
@dotnet-bot Test Windows_NT Release please This appears to be #475 |
@MattGertz for approval |
Conflicts: src/VsixV3/Microsoft.Net.Sdk.swr
@@ -4,7 +4,20 @@ | |||
"certificate": "Microsoft402", | |||
"strongName": "MsSharedLib72", | |||
"values": [ | |||
"Microsoft.NET.Build.Tasks.dll" | |||
"Raw/Microsoft.NET.Build.Tasks.dll", |
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.
Microsoft.NET.Build.Tasks.dll [](start = 21, length = 29)
So did the location of this DLL move, or is it in both places? Did you check that it is still packaged properly etc.
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.
It moved.
Approved to merge |
* dotnet/master: (38 commits) Remove workaround for VB compiler since the bug's been fixed. Pass the correct delimiter for DefineConstants for C# and VB Rename ResolvePackageReferencesDesignTime to CollectPackageReferences Add Missing Dependency Facades to SDK package Run PackageReference de-dupe target before ResolvePackageReferencesDesignTime so that VS can get de-duped list Switch back to deduplicating implicit PackageReference items in a target instead of in evaluation Add implicitly expanded design time facades to deps.json for PreserveCompilationContext Remove TODO and outdated comment Add inference logic for RuntimeFrameworkVersion and implicit package reference for Microsoft.NETCore.App Update test sdk version. Fix for source navigation in netcoreapp1.0 projects. Deduplicate implicit package references in evaluation instead of a target Move implicit PackageReference logic to DefaultItems.props and DefaultItems.targets Update link for more information on implicit PackageReference items Add warning message for when projects override implicit PackageReference items Allow projects to override implicit PackageReference items with item Include syntax Add aka.ms link for more information on implicit items Simplify duplicate item error message to be one resource string, only generate error if implicit items are enabled Revert "Merge pull request dotnet#626 from nguerrera/satellites" Add test for explicitly including an item from a folder excluded from the implicit item includes Put "packages" back in list of folders to be excluded from implicit items ...
This reverts commit 1ac0ffd. Conflicts: src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.xlf src/VsixV3/Microsoft.Net.Sdk.swr
…425.5 (dotnet#626) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19225.5
Build and deploy satellites from translations
The satellites are still not being picked up correctly by core MSBuild, but they work with desktop MSBuild. I am still investigating but I believe this is due to dotnet/msbuild#1476.
Change the target SatelliteDllsProjectOutputGroup to SatelliteDllsProjectOutputGroupWithFinalOutputPath, which will include the resources from the final output path rather than the intermediate path and hence will include the signed satellite assemblies
Customer scenario
Build messages from the SDK will not be localized without this change
Bugs this fixes:
SDK portion of VSO 279745
(The project system portion was already completed before entering escrow)
Workarounds, if any
None
Risk
Low
Performance impact
None for English. Only the required small impact of loading satellite assembly for non-English languages.
Is this a regression from a previous update?
No. This was feature work approved to be done by RC3.
How was this bug found?
N/A. This was known work that wasn't done until now.
@srivatsn @dotnet/project-system