Skip to content

Commit d08be6b

Browse files
teo-tsirpanisteo-tsirpanis
committed
Fix compile errors.
1 parent 41d2f7c commit d08be6b

File tree

14 files changed

+319
-303
lines changed

14 files changed

+319
-303
lines changed

‎global.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.24610.7",
3+
"version": "9.0.100",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
7-
"tools": {
8-
"dotnet": "10.0.100-alpha.1.24610.7"
9-
},
107
"msbuild-sdks": {
118
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4",
129
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4",

‎src/coreclr/tools/Common/TypeSystem/Common/Utilities/CustomAttributeTypeNameParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ private TypeDesc GetSimpleTypeFromModule(TypeName typeName, ModuleDesc module)
191191
return canonType;
192192
}
193193

194-
(string typeNamespace, string name) = TypeNameHelpers.Split(fullName);
194+
(string typeNamespace, string name) = TypeName.Split(fullName);
195195

196196
return module.GetType(typeNamespace, name, throwIfNotFound: false);
197197
}

‎src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<TargetFrameworks>$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<UseCompilerGeneratedDocXmlFile>false</UseCompilerGeneratedDocXmlFile>
77
<IsPackable>true</IsPackable>

‎src/libraries/System.IO.Pipes/System.IO.Pipes.sln‎

Lines changed: 260 additions & 251 deletions
Large diffs are not rendered by default.

‎src/libraries/System.IO.Pipes/src/System/IO/Pipes/NamedPipeServerStream.Windows.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void RunAsClient(PipeStreamImpersonationWorker impersonationWorker)
257257
}
258258
else if (execHelper._revertImpersonateErrorCode != 0)
259259
{
260-
throw WinIOError(execHelper._revertImpersonateErrorCode);
260+
Environment.FailFast(null, WinIOError(execHelper._revertImpersonateErrorCode));
261261
}
262262
}
263263

‎src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35527.113
5+
MinimumVisualStudioVersion = 10.0.40219.1
26
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2231787B-18C9-493C-A102-1E0E6A3D2CD3}"
37
EndProject
48
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{282C76D4-54C5-44BF-9F15-1A4302234DBB}"
@@ -41,11 +45,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{19CD37AB-E6A
4145
EndProject
4246
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}"
4347
EndProject
44-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{F42F22BE-FD44-4242-9E0F-A243EB763BF4}"
48+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{F42F22BE-FD44-4242-9E0F-A243EB763BF4}"
4549
EndProject
46-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{A7680571-EBD8-41A8-8AE1-90F01057673F}"
50+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A7680571-EBD8-41A8-8AE1-90F01057673F}"
4751
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{D2576A59-A647-4D5C-8690-C4CC586631F6}"
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D2576A59-A647-4D5C-8690-C4CC586631F6}"
4953
EndProject
5054
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{5224A519-F2DB-487E-AB04-CB1C45853202}"
5155
EndProject
@@ -129,27 +133,31 @@ Global
129133
EndGlobalSection
130134
GlobalSection(NestedProjects) = preSolution
131135
{2231787B-18C9-493C-A102-1E0E6A3D2CD3} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01}
132-
{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01}
133136
{282C76D4-54C5-44BF-9F15-1A4302234DBB} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
137+
{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {19CD37AB-E6A2-431C-8893-5ED903B847BA}
134138
{2A92C2EE-358D-4DFE-8AA4-4D480623F3BF} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
135139
{587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
136-
{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
137-
{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {19CD37AB-E6A2-431C-8893-5ED903B847BA}
138140
{B905521A-FE25-4D35-9929-B2622F590263} = {19CD37AB-E6A2-431C-8893-5ED903B847BA}
141+
{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01}
139142
{D4293B41-CA47-46DB-8E11-C532E8E8DAF1} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
140143
{9EE464AC-5B4A-470B-845F-FD9FA44269D8} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
141144
{1092AC3C-B01C-4AC4-9F05-6FDB23C699B3} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
142145
{930B1167-83BE-42CC-BFED-096CB2BA19F1} = {FA7C2C03-A446-4807-A092-9A3ABD5E5FD7}
146+
{4D7BBEC2-8A8D-4BAA-AD6B-55905F107317} = {B80A55DB-C1C4-4A99-A1C8-BFD6606C28AF}
143147
{8E173D5F-6011-4471-8514-FF9C7D4417B5} = {F42F22BE-FD44-4242-9E0F-A243EB763BF4}
144148
{064431FF-EE86-4C61-8859-0F824AD2B69A} = {F42F22BE-FD44-4242-9E0F-A243EB763BF4}
145-
{F42F22BE-FD44-4242-9E0F-A243EB763BF4} = {5224A519-F2DB-487E-AB04-CB1C45853202}
146149
{35B39665-CBB5-449F-B51D-91B1B021266F} = {A7680571-EBD8-41A8-8AE1-90F01057673F}
147150
{98445B72-AFD2-462C-94F2-65E5C1A25B22} = {A7680571-EBD8-41A8-8AE1-90F01057673F}
148-
{A7680571-EBD8-41A8-8AE1-90F01057673F} = {5224A519-F2DB-487E-AB04-CB1C45853202}
149151
{CDFCF052-9073-42E3-BC4F-5283E9BFAD1B} = {D2576A59-A647-4D5C-8690-C4CC586631F6}
152+
{F42F22BE-FD44-4242-9E0F-A243EB763BF4} = {5224A519-F2DB-487E-AB04-CB1C45853202}
153+
{A7680571-EBD8-41A8-8AE1-90F01057673F} = {5224A519-F2DB-487E-AB04-CB1C45853202}
150154
{D2576A59-A647-4D5C-8690-C4CC586631F6} = {5224A519-F2DB-487E-AB04-CB1C45853202}
151155
EndGlobalSection
152156
GlobalSection(ExtensibilityGlobals) = postSolution
153157
SolutionGuid = {64BB97AB-FD23-40BA-B638-FE4756AE6452}
154158
EndGlobalSection
159+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
160+
..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{064431ff-ee86-4c61-8859-0f824ad2b69a}*SharedItemsImports = 5
161+
..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{98445b72-afd2-462c-94f2-65e5c1a25b22}*SharedItemsImports = 5
162+
EndGlobalSection
155163
EndGlobal

‎src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
4+
<TargetFrameworks>$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<DefaultLanguage>en-US</DefaultLanguage>
77
<CLSCompliant>false</CLSCompliant>

‎src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<!-- 436: Type conflicts on "Interop" due to InternalsVisibleTo access
77
SYSLIB0037: AssemblyName members HashAlgorithm, ProcessorArchitecture, and VersionCompatibility are obsolete. -->
88
<NoWarn>$(NoWarn);436;SYSLIB0037</NoWarn>
9-
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
9+
<TargetFrameworks>$(NetCoreAppPrevious);$(NetFrameworkMinimum)</TargetFrameworks>
1010
<DefineConstants Condition="'$(TargetOS)' == 'browser'">$(DefineConstants);TARGET_BROWSER</DefineConstants>
1111
</PropertyGroup>
1212

@@ -152,12 +152,6 @@
152152
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
153153
<PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
154154
</ItemGroup>
155-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
156-
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
157-
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
158-
Private="true"
159-
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
160-
</ItemGroup>
161155

162156
<ItemGroup Condition="'$(TargetOS)' == 'browser'">
163157
<WasmFilesToIncludeFromPublishDir Include="$(AssemblyName).dll" />

‎src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35527.113
5+
MinimumVisualStudioVersion = 10.0.40219.1
26
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FE3865D4-48C5-4F67-A5EB-C041A1895100}"
37
EndProject
48
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\ref\System.Collections.NonGeneric.csproj", "{0887007C-76C8-4B25-B3A6-2C563659A633}"
@@ -45,11 +49,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A0B73BB-E1B
4549
EndProject
4650
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{82996086-0F1B-4E0F-9121-07C396EF0EC7}"
4751
EndProject
48-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{E740D6D1-02CB-4842-A440-025C08D5BFB1}"
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{E740D6D1-02CB-4842-A440-025C08D5BFB1}"
4953
EndProject
50-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{1119205E-8DB4-4506-A47E-309F63443E09}"
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1119205E-8DB4-4506-A47E-309F63443E09}"
5155
EndProject
52-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{25F0BAE7-C932-46B3-8E5C-64759A0B2B2F}"
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{25F0BAE7-C932-46B3-8E5C-64759A0B2B2F}"
5357
EndProject
5458
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{78FAC980-2414-44E2-BED7-322089791D13}"
5559
EndProject
@@ -141,29 +145,33 @@ Global
141145
EndGlobalSection
142146
GlobalSection(NestedProjects) = preSolution
143147
{FE3865D4-48C5-4F67-A5EB-C041A1895100} = {4ED5729F-DB06-4332-9876-354C28894824}
144-
{0B9499DE-C86E-4F3F-8F92-73DCC244A13B} = {4ED5729F-DB06-4332-9876-354C28894824}
145148
{0887007C-76C8-4B25-B3A6-2C563659A633} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
146149
{C9453B2A-8A83-4359-8348-EEDEB54D794A} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
147-
{72BC545A-3222-4496-B814-7DDC9A31BE96} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
148-
{28201266-9EA3-4B92-83C5-ADEC5608E27A} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
149-
{0FDBED8F-DA12-4451-AB7E-01E7065F1610} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
150-
{2593060B-10ED-40C1-8943-3C016EFD8928} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
151150
{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F}
152-
{E1E671BC-A82F-400A-9C93-ACB199A43BDA} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F}
153151
{3CA4B29C-71BF-4709-8DA4-E1466A80FDB1} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
154152
{E4331304-3DDF-40A7-95A4-B2E94AF12842} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
155153
{AABA6C21-1DC9-471F-979E-F35930A106F3} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
156154
{CDB32066-5BD2-46EB-AFF1-07554FBF6942} = {82996086-0F1B-4E0F-9121-07C396EF0EC7}
155+
{72BC545A-3222-4496-B814-7DDC9A31BE96} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
156+
{28201266-9EA3-4B92-83C5-ADEC5608E27A} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
157+
{E1E671BC-A82F-400A-9C93-ACB199A43BDA} = {5A0B73BB-E1B6-4034-AA56-A82762FD405F}
158+
{0B9499DE-C86E-4F3F-8F92-73DCC244A13B} = {4ED5729F-DB06-4332-9876-354C28894824}
159+
{0FDBED8F-DA12-4451-AB7E-01E7065F1610} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
160+
{2593060B-10ED-40C1-8943-3C016EFD8928} = {BF0DEEC5-58A6-4156-B44B-E3C248A01523}
157161
{81E36AA4-93BB-4BB9-9AB5-C8BBAE2FD7C3} = {E740D6D1-02CB-4842-A440-025C08D5BFB1}
158162
{FF6004AA-C38E-4083-80CC-D6515A41937E} = {E740D6D1-02CB-4842-A440-025C08D5BFB1}
159-
{E740D6D1-02CB-4842-A440-025C08D5BFB1} = {78FAC980-2414-44E2-BED7-322089791D13}
160163
{68A0DB6E-97AB-433F-8FE0-30CDAB9E0E3C} = {1119205E-8DB4-4506-A47E-309F63443E09}
161164
{EF1F5D22-5888-4C65-881D-FA34D5A1C9FB} = {1119205E-8DB4-4506-A47E-309F63443E09}
162-
{1119205E-8DB4-4506-A47E-309F63443E09} = {78FAC980-2414-44E2-BED7-322089791D13}
163165
{45611BC7-50D2-42A9-BA9C-94DA5ADA3994} = {25F0BAE7-C932-46B3-8E5C-64759A0B2B2F}
166+
{E740D6D1-02CB-4842-A440-025C08D5BFB1} = {78FAC980-2414-44E2-BED7-322089791D13}
167+
{1119205E-8DB4-4506-A47E-309F63443E09} = {78FAC980-2414-44E2-BED7-322089791D13}
164168
{25F0BAE7-C932-46B3-8E5C-64759A0B2B2F} = {78FAC980-2414-44E2-BED7-322089791D13}
165169
EndGlobalSection
166170
GlobalSection(ExtensibilityGlobals) = postSolution
167171
SolutionGuid = {7F4F25A0-74DA-46ED-BC2B-99607E973B0D}
168172
EndGlobalSection
173+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
174+
..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{ef1f5d22-5888-4c65-881d-fa34d5a1c9fb}*SharedItemsImports = 5
175+
..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{ff6004aa-c38e-4083-80cc-d6515a41937e}*SharedItemsImports = 5
176+
EndGlobalSection
169177
EndGlobal

‎src/libraries/System.Security.AccessControl/src/System/Security/AccessControl/Privilege.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ private void Dispose(bool disposing)
305305
}
306306
}
307307

308-
if (this.isImpersonating)
308+
if (this.isImpersonating && !Interop.Advapi32.RevertToSelf())
309309
{
310-
Interop.Advapi32.RevertToSelf();
310+
Environment.FailFast(Marshal.GetLastPInvokeErrorMessage());
311311
}
312312

313313
this.disposed = true;

0 commit comments

Comments
 (0)