Skip to content
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

Jump to bottom

Update runtime repo to use Preview 7 SDK #72145

Merged
merged 19 commits into from
Aug 15, 2022
Merged

Update runtime repo to use Preview 7 SDK #72145

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d27729f
Update runtime repo to use Preview 6 SDK
agocke Jul 13, 2022
f276db3
Fix json encoding
agocke Jul 14, 2022
0c66891
Use TrimMode=full instead of TrimmerDefaultAction
agocke Jul 14, 2022
556bb8a
Also set TrimMode=full in TrimmingTests props file
agocke Jul 14, 2022
b40a841
Add TrimmerDefaultAction for NativeAOT library testing
agocke Jul 15, 2022
5af1afa
Remove usage of default trim mode
agocke Jul 15, 2022
e1b012a
Replace with TrimMode partial
agocke Jul 15, 2022
890efef
Merge remote-tracking branch 'upstream/main' into runtime-p6
agocke Jul 15, 2022
2c4a9ca
Merge branch 'runtime-p6' of github.com:agocke/runtime into p7-sdk
jkoritzinsky Aug 11, 2022
b137f4d
Update SDK to preview 7
jkoritzinsky Aug 11, 2022
a3ee434
Merge branch 'main' of github.com:dotnet/runtime into p7-sdk
jkoritzinsky Aug 11, 2022
8774ee3
Update Roslyn to 4.4.0-2.22412.11
hoyosjs Aug 13, 2022
9d0508a
Merge remote-tracking branch 'upstream/main' into runtime-p6
AaronRobinsonMSFT Aug 13, 2022
459a67a
Merge in main and update pgo project
AaronRobinsonMSFT Aug 13, 2022
79ff97d
Add ByRefFields feature flag.
AaronRobinsonMSFT Aug 13, 2022
99af1bd
Inline deleted ILLink.targets logic
MichalStrehovsky Aug 15, 2022
6fa5900
Cleanups
MichalStrehovsky Aug 15, 2022
cedada9
Ensure no GC hole for LbrTraceEventData
jakobbotsch Aug 15, 2022
17a4e22
Use static workaround since UnscopedRef is not yet available
jakobbotsch Aug 15, 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
3 changes: 1 addition & 2 deletions eng/testing/linker/SupportFiles/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<PublishTrimmed>true</PublishTrimmed>
<SkipImportRepoLinkerTargets>true</SkipImportRepoLinkerTargets>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<TrimmerDefaultAction>link</TrimmerDefaultAction>
<TrimMode>link</TrimMode>
<TrimMode>full</TrimMode>
<TrimmerRemoveSymbols>false</TrimmerRemoveSymbols>
<SelfContained>true</SelfContained>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "7.0.100-preview.5.22307.18",
"version": "7.0.100-preview.6.22352.1",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.100-preview.5.22307.18"
"dotnet": "7.0.100-preview.6.22352.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3",
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/crossgen2/crossgen2.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Configurations>Debug;Release;Checked</Configurations>
<ServerGarbageCollection>true</ServerGarbageCollection>
<!-- Trim all dependent assemblies as though they were all marked IsTrimmable. -->
<TrimmerDefaultAction>link</TrimmerDefaultAction>
<TrimMode>full</TrimMode>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this line if this is now the default?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we don't, I was just being explicit.

</PropertyGroup>

<ItemGroup Label="Embedded Resources">
Expand Down
2 changes: 1 addition & 1 deletion src/tests/nativeaot/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TrimmerDefaultAction>link</TrimmerDefaultAction>
<TrimMode>full</TrimMode>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll probably need to do the opposite here - nativeaot tests expect trimming and require the (now default) TrimMode=full. So this line is technically not needed. But the rest of the coreclr test tree will want to keep the partial TrimMode.

</PropertyGroup>
<Import Project="../Directory.Build.props" />
</Project>