Skip to content

Commit 61c277c

Browse files
Couple small tweaks (#11)
* Keep repro project in the SLN * Move ILTrim to the top of the SLN (first entry is what VS defaults to as a startup project even if the project is not an EXE...) * Remove unnecessary line.
1 parent 86946d1 commit 61c277c

2 files changed

Lines changed: 38 additions & 22 deletions

File tree

src/coreclr/tools/ILTrim/ILTrim.sln

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31717.71
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31702.278
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILTrim", "ILTrim.Exe\ILTrim.csproj", "{ADB33654-B6E1-495E-8D24-F036043749DC}"
7+
EndProject
68
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.DependencyAnalysisFramework", "..\aot\ILCompiler.DependencyAnalysisFramework\ILCompiler.DependencyAnalysisFramework.csproj", "{9EFC242F-803E-41A5-B221-D3937BC62AAF}"
79
EndProject
810
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILTrim.Tests", "ILTrim.Tests\ILTrim.Tests.csproj", "{195CB4E2-8D84-4348-83CD-240794122D28}"
911
EndProject
1012
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILTrim.Core", "ILTrim\ILTrim.Core.csproj", "{E7FB31C3-83E2-47B4-94A6-91AD2084CFD4}"
1113
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILTrim", "ILTrim.Exe\ILTrim.csproj", "{ADB33654-B6E1-495E-8D24-F036043749DC}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "repro", "repro\repro.csproj", "{43136E18-23D1-4133-B6E4-FCBB2F46D719}"
1315
EndProject
1416
Global
1517
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,6 +26,24 @@ Global
2426
Release|x86 = Release|x86
2527
EndGlobalSection
2628
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
30+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|Any CPU.Build.0 = Debug|Any CPU
31+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x64.ActiveCfg = Debug|Any CPU
32+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x64.Build.0 = Debug|Any CPU
33+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x86.ActiveCfg = Debug|Any CPU
34+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x86.Build.0 = Debug|Any CPU
35+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x64.ActiveCfg = Debug|Any CPU
38+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x64.Build.0 = Debug|Any CPU
39+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x86.ActiveCfg = Debug|Any CPU
40+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x86.Build.0 = Debug|Any CPU
41+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|Any CPU.Build.0 = Release|Any CPU
43+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x64.ActiveCfg = Release|Any CPU
44+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x64.Build.0 = Release|Any CPU
45+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x86.ActiveCfg = Release|Any CPU
46+
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x86.Build.0 = Release|Any CPU
2747
{9EFC242F-803E-41A5-B221-D3937BC62AAF}.Checked|Any CPU.ActiveCfg = Checked|x86
2848
{9EFC242F-803E-41A5-B221-D3937BC62AAF}.Checked|x64.ActiveCfg = Checked|x64
2949
{9EFC242F-803E-41A5-B221-D3937BC62AAF}.Checked|x64.Build.0 = Checked|x64
@@ -75,24 +95,21 @@ Global
7595
{E7FB31C3-83E2-47B4-94A6-91AD2084CFD4}.Release|x64.Build.0 = Release|Any CPU
7696
{E7FB31C3-83E2-47B4-94A6-91AD2084CFD4}.Release|x86.ActiveCfg = Release|Any CPU
7797
{E7FB31C3-83E2-47B4-94A6-91AD2084CFD4}.Release|x86.Build.0 = Release|Any CPU
78-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
79-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|Any CPU.Build.0 = Debug|Any CPU
80-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x64.ActiveCfg = Debug|Any CPU
81-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x64.Build.0 = Debug|Any CPU
82-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x86.ActiveCfg = Debug|Any CPU
83-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Checked|x86.Build.0 = Debug|Any CPU
84-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
86-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x64.ActiveCfg = Debug|Any CPU
87-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x64.Build.0 = Debug|Any CPU
88-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x86.ActiveCfg = Debug|Any CPU
89-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Debug|x86.Build.0 = Debug|Any CPU
90-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
91-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|Any CPU.Build.0 = Release|Any CPU
92-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x64.ActiveCfg = Release|Any CPU
93-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x64.Build.0 = Release|Any CPU
94-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x86.ActiveCfg = Release|Any CPU
95-
{ADB33654-B6E1-495E-8D24-F036043749DC}.Release|x86.Build.0 = Release|Any CPU
98+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Checked|Any CPU.ActiveCfg = Checked|x86
99+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Checked|x64.ActiveCfg = Checked|x64
100+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Checked|x64.Build.0 = Checked|x64
101+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Checked|x86.ActiveCfg = Checked|x86
102+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Checked|x86.Build.0 = Checked|x86
103+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Debug|Any CPU.ActiveCfg = Debug|x86
104+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Debug|x64.ActiveCfg = Debug|x64
105+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Debug|x64.Build.0 = Debug|x64
106+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Debug|x86.ActiveCfg = Debug|x86
107+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Debug|x86.Build.0 = Debug|x86
108+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Release|Any CPU.ActiveCfg = Release|x86
109+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Release|x64.ActiveCfg = Release|x64
110+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Release|x64.Build.0 = Release|x64
111+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Release|x86.ActiveCfg = Release|x86
112+
{43136E18-23D1-4133-B6E4-FCBB2F46D719}.Release|x86.Build.0 = Release|x86
96113
EndGlobalSection
97114
GlobalSection(SolutionProperties) = preSolution
98115
HideSolutionNode = FALSE

src/coreclr/tools/ILTrim/ILTrim/DependencyAnalysis/TokenBased/FieldDefinitionNode.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ protected override EntityHandle WriteInternal(ModuleWritingContext writeContext)
3939

4040
// TODO: the signature blob might contain references to tokens we need to rewrite
4141
var signatureBlob = reader.GetBlobBytes(fieldDef.Signature);
42-
FieldDefinitionNode fieldNode = writeContext.Factory.FieldDefinition(_module, Handle);
4342

4443
return builder.AddFieldDefinition(
4544
fieldDef.Attributes,

0 commit comments

Comments
 (0)