Skip to content

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28668

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.

Sign up for GitHub

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

Merged
dsplaisted merged 20 commits into from
Nov 1, 2022
Merged

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' #28668

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5548480
Return workload manifests in defined, controllable order
dsplaisted Oct 17, 2022
bcaed25
Don't infer rid on non exe project type
nagilson Oct 17, 2022
a80d6b5
Add opt out feature and tests
nagilson Oct 18, 2022
10c3bc5
Update src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Runt…
nagilson Oct 18, 2022
47c024b
Make it a win only fact
nagilson Oct 18, 2022
0f654d6
Merge branch 'nagilson-exe-rids' of https://github.com/nagilson/sdk i…
nagilson Oct 18, 2022
fb14de3
make the test fail in the old scenario
nagilson Oct 18, 2022
d3ed325
Consider that TestProjects May be Exe Projects without Being Tagged a…
nagilson Oct 18, 2022
d97c27e
Update dependencies from https://github.com/dotnet/fsharp build 20221…
dotnet-maestro[bot] Oct 19, 2022
9299986
Update dependencies from https://github.com/microsoft/vstest build 20…
dotnet-maestro[bot] Oct 19, 2022
b256814
Remove opt out feature and put it into UCR
nagilson Oct 19, 2022
d1c8744
Fix tests. Only thing remaining is to improve test quality
nagilson Oct 19, 2022
141ab83
Merge pull request #28655 from dotnet/darc-release/7.0.1xx-a8bfada8-e…
marcpopMSFT Oct 19, 2022
63b3654
Merge pull request #28627 from dsplaisted/workload-manifest-targets-i…
dsplaisted Oct 19, 2022
a00b2cf
Fix whitespace
nagilson Oct 19, 2022
d3173a2
Fix tests
nagilson Oct 19, 2022
6942fe7
Merge pull request #28628 from nagilson/nagilson-exe-rids
nagilson Oct 20, 2022
24f5a85
Merge branch 'release/7.0.1xx' into release/7.0.2xx
Oct 20, 2022
f88e36e
Merge remote-tracking branch 'upstream/release/7.0.2xx' into merge/re…
nagilson Oct 31, 2022
2939b90
Account for changes in 7.0.2xx not in 7.0.1xx
nagilson Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix whitespace
  • Loading branch information
@nagilson
nagilson committed Oct 19, 2022
commit a00b2cf796ca568a5bba2fa616aab25e0ac992e3
3 changes: 1 addition & 2 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ Copyright (c) .NET Foundation. All rights reserved.
'$(PublishReadyToRun)' == 'true' or
'$(PublishSingleFile)' == 'true' or
'$(PublishAot)' == 'true'
)">
true</UseCurrentRuntimeIdentifier>
)">true</UseCurrentRuntimeIdentifier>
</PropertyGroup>

<PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true'">
Expand Down