-
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
Add netsdk overrides #2021
Closed
KevinRansom
wants to merge
206
commits into
dotnet:release/2.1.2xx
from
KevinRansom:overridenetsdktargets
Closed
Add netsdk overrides #2021
KevinRansom
wants to merge
206
commits into
dotnet:release/2.1.2xx
from
KevinRansom:overridenetsdktargets
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
Update the branding in master to preview3.
LOC CHECKIN | sdk-master | 20170529
Merge release/2.0.0 to master
Conflicts: TestAssets/TestProjects/LinkTest/LinkTest/LinkTest.csproj src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.cs.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.de.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.es.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.fr.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.it.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.ja.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.ko.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.pl.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.pt-BR.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.ru.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.tr.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.zh-Hans.xlf src/Tasks/Microsoft.NET.Build.Tasks/Resources/xlf/Strings.zh-Hant.xlf
MSBuild first does a default InvokeMember using the Type.DefaultMember then falls back to an ordinal ignore case match if that fails. This avoids that second lookup by picking the correct case of "SubString". Hit while debugging: dotnet/msbuild#2217.
Avoid first chance exception opening SDK projects
Use glob for signing resources
Merge release/2.0.0 into master
The old implementation combined the relative `<ProjectReference Include="..." />` path with the directory of the `ProjectAssetFile`. Corrected this to combine the relative project reference with the current's project path.
Merge release/2.0.0 in to master
This was allocating 0.2% of all memory during some design-time builds.
Avoid boxing List<T> enumerable
Insert NuGet Build 4.4.0-preview1-4365 and corresponding CLI version into sdk
Change xml formatting for store artifacts xml
This condition was being interpreted as a content, because the $() expression never closed, so it was comparing the literal string `$(ImportNuGetBuildTasksPackTargetsFromSdk` to `false`, which doesn't match. Fixes dotnet#1491.
* Update RepoToolset to 1.0.0-beta-62615-02 Sets algorithm used to calculate source file checksums stored in PDB to SHA256.
…elease/2.1.2xx-to-release/2.1.3xx
…release/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
Merge release/2.1 to master
…master Merge release/2.1.3xx to master
…master Merge release/2.1.3xx to master
Resolves dotnet#783
…ollectPackageReferences
…ssTargeting folder
…ctory Rename SDK build directory to "targets" in source and layout
… of the CLI. Also replaced NETSdkError with NETSdkMessage. This message will be driven by a property set by the CLI.
…etstandard-package Update implicit NETStandard.Library package version, and re-enable test
…verride-check Revert dotnet#699
do not add reference to Microsoft.NETCore.Platforms during dotnet pack for tools
…so that we can get a good stack trace when it fails with the ArgumentOutOfRangeException.
Displaying a message whenever a build happens using a preview version of the CLI
The input of PackTask is relative path. And it ends up getting wrong full path in the task (prefixed with Library path instead of App path). Give PackTask full path as input.
JL03-Yue
pushed a commit
that referenced
this pull request
Mar 19, 2024
…108.3 (#2021) [main] Update dependencies from dotnet/arcade
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.
Due to the way F# is integrated into the Net Sdk it is not possible for an F# target file to override SDK targets.
We need to be able to do that to enable the Net Sdkmechanism to add AssemblyInfo properties to F# apps and libraries.
This PR renames the existing Microsoft.Net.Sdk.FSharp.targets to Microsoft.FSharp.NetSdk.targets, so that we can use the name Microsoft.Net.Sdk.FSharp.targets consistently with C# and VB.
Microsoft.Net.Sdk.FSharp.targets selects a target file deployed with F# compiler.
@nguerrera, @livarcocc , @brettfo