Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 6c6f9ab

Browse files
stephentoubstephentoub
committed
Merge pull request #2215 from stephentoub/fix_warnings
Bring build warnings to 0
2 parents 02a6f1c + 2bce90a commit 6c6f9ab

File tree

4 files changed

+18
-103
lines changed

4 files changed

+18
-103
lines changed

‎src/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<DefineConstants>$(DefineConstants);PUBLIC_DEBUG</DefineConstants>
1212
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
1313
<NuGetTargetFrameworkMoniker>DNXCore,Version=v5.0</NuGetTargetFrameworkMoniker>
14+
<NoWarn>0436</NoWarn> <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib -->
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(TargetsUnix)' == 'true' ">
1617
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/System.Private.Uri/src/System.Private.Uri.CoreCLR.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<NugetTargetFrameworkMoniker>DNXCore,Version=v5.0</NugetTargetFrameworkMoniker>
1212
<IgnoreArchitectureMismatches>true</IgnoreArchitectureMismatches>
1313
<PostFilterNugetReferences>true</PostFilterNugetReferences>
14+
<NoWarn>0436</NoWarn> <!-- Suppress warnings for type conflicts between SafeFileHandle in partial facade and mscorlib -->
1415
</PropertyGroup>
1516

1617
<!-- Default configurations to help VS understand the configurations -->

‎src/System.Security.Principal.Windows/tests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
3+
"System.Diagnostics.Debug": "4.0.10-beta-*",
34
"System.Reflection": "4.0.10-beta-*",
45
"System.Runtime": "4.0.20-beta-*",
56
"System.Runtime.Handles": "4.0.0-beta-*",
67
"System.Runtime.InteropServices": "4.0.20-beta-*",
78
"System.Collections": "4.0.10-beta-*",
89
"System.Security.Claims": "4.0.0-beta-*",
9-
"System.Security.Principal.Windows": "4.0.0-beta-*",
1010
"xunit": "2.0.0-beta5-build2785",
1111
"xunit.abstractions.netcore": "1.0.0-prerelease",
1212
"xunit.assert": "2.0.0-beta5-build2785",

‎src/System.Security.Principal.Windows/tests/project.lock.json

Lines changed: 15 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
"lib/DNXCore50/System.Collections.dll": {}
1515
}
1616
},
17-
"System.Diagnostics.Debug/4.0.0-beta-23024": {
17+
"System.Diagnostics.Debug/4.0.10-beta-23024": {
1818
"dependencies": {
1919
"System.Runtime": "4.0.0-beta-23024"
2020
},
2121
"compile": {
2222
"ref/dotnet/System.Diagnostics.Debug.dll": {}
23+
},
24+
"runtime": {
25+
"lib/DNXCore50/System.Diagnostics.Debug.dll": {}
2326
}
2427
},
2528
"System.Globalization/4.0.0-beta-23024": {
@@ -155,26 +158,6 @@
155158
"lib/dotnet/System.Security.Principal.dll": {}
156159
}
157160
},
158-
"System.Security.Principal.Windows/4.0.0-beta-23024": {
159-
"dependencies": {
160-
"System.Runtime": "4.0.0-beta-23024",
161-
"System.Resources.ResourceManager": "4.0.0-beta-23024",
162-
"System.Collections": "4.0.0-beta-23024",
163-
"System.Runtime.InteropServices": "4.0.0-beta-23024",
164-
"System.Security.Claims": "4.0.0-beta-23024",
165-
"System.Security.Principal": "4.0.0-beta-23024",
166-
"System.Diagnostics.Debug": "4.0.0-beta-23024",
167-
"System.Reflection": "4.0.0-beta-23024",
168-
"System.Runtime.Extensions": "4.0.0-beta-23024",
169-
"System.Threading": "4.0.10-beta-23024"
170-
},
171-
"compile": {
172-
"ref/dotnet/System.Security.Principal.Windows.dll": {}
173-
},
174-
"runtime": {
175-
"lib/DNXCore50/System.Security.Principal.Windows.dll": {}
176-
}
177-
},
178161
"System.Text.Encoding/4.0.0-beta-23024": {
179162
"dependencies": {
180163
"System.Runtime": "4.0.0-beta-23024"
@@ -183,18 +166,6 @@
183166
"ref/dotnet/System.Text.Encoding.dll": {}
184167
}
185168
},
186-
"System.Threading/4.0.10-beta-23024": {
187-
"dependencies": {
188-
"System.Runtime": "4.0.0-beta-23024",
189-
"System.Threading.Tasks": "4.0.0-beta-23024"
190-
},
191-
"compile": {
192-
"ref/dotnet/System.Threading.dll": {}
193-
},
194-
"runtime": {
195-
"lib/DNXCore50/System.Threading.dll": {}
196-
}
197-
},
198169
"System.Threading.Tasks/4.0.0-beta-23024": {
199170
"dependencies": {
200171
"System.Runtime": "4.0.0-beta-23024"
@@ -284,15 +255,16 @@
284255
"runtimes/win8-aot/lib/netcore50/System.Collections.dll"
285256
]
286257
},
287-
"System.Diagnostics.Debug/4.0.0-beta-23024": {
288-
"sha512": "PtlEckI5H5eQaFDk/Pji9RU+gNAdh4S1f2mOVjjADmqUfxpce4qybCVKeOgtuUMik2FwqKwBk0QDvC6AUTwDeg==",
258+
"System.Diagnostics.Debug/4.0.10-beta-23024": {
259+
"serviceable": true,
260+
"sha512": "dnfynhlmsMaRB/YvN5JifCdYYnRf/mTjFAAM1awp3wrjsgOSpAzOE4sxYX0hdY1FyAFTDcUnusQ+H3AMcF3Stw==",
289261
"files": [
290-
"License.rtf",
291-
"System.Diagnostics.Debug.4.0.0-beta-23024.nupkg",
292-
"System.Diagnostics.Debug.4.0.0-beta-23024.nupkg.sha512",
262+
"System.Diagnostics.Debug.4.0.10-beta-23024.nupkg",
263+
"System.Diagnostics.Debug.4.0.10-beta-23024.nupkg.sha512",
293264
"System.Diagnostics.Debug.nuspec",
294-
"lib/net45/_._",
295-
"lib/win8/_._",
265+
"lib/DNXCore50/System.Diagnostics.Debug.dll",
266+
"lib/net46/_._",
267+
"lib/netcore50/System.Diagnostics.Debug.dll",
296268
"ref/dotnet/System.Diagnostics.Debug.dll",
297269
"ref/dotnet/System.Diagnostics.Debug.xml",
298270
"ref/dotnet/de/System.Diagnostics.Debug.xml",
@@ -304,19 +276,8 @@
304276
"ref/dotnet/ru/System.Diagnostics.Debug.xml",
305277
"ref/dotnet/zh-hans/System.Diagnostics.Debug.xml",
306278
"ref/dotnet/zh-hant/System.Diagnostics.Debug.xml",
307-
"ref/net45/_._",
308-
"ref/netcore50/System.Diagnostics.Debug.dll",
309-
"ref/netcore50/System.Diagnostics.Debug.xml",
310-
"ref/netcore50/de/System.Diagnostics.Debug.xml",
311-
"ref/netcore50/es/System.Diagnostics.Debug.xml",
312-
"ref/netcore50/fr/System.Diagnostics.Debug.xml",
313-
"ref/netcore50/it/System.Diagnostics.Debug.xml",
314-
"ref/netcore50/ja/System.Diagnostics.Debug.xml",
315-
"ref/netcore50/ko/System.Diagnostics.Debug.xml",
316-
"ref/netcore50/ru/System.Diagnostics.Debug.xml",
317-
"ref/netcore50/zh-hans/System.Diagnostics.Debug.xml",
318-
"ref/netcore50/zh-hant/System.Diagnostics.Debug.xml",
319-
"ref/win8/_._"
279+
"ref/net46/_._",
280+
"runtimes/win8-aot/lib/netcore50/System.Diagnostics.Debug.dll"
320281
]
321282
},
322283
"System.Globalization/4.0.0-beta-23024": {
@@ -646,29 +607,6 @@
646607
"ref/win8/_._"
647608
]
648609
},
649-
"System.Security.Principal.Windows/4.0.0-beta-23024": {
650-
"serviceable": true,
651-
"sha512": "0f8xoStHj+BucI7BND7GB8i27o+9LM4xpg7xf5KRE9qyavrMl+GvzYdS+6fkBIdRt3wxM8PGlkS4kia5xhIT0w==",
652-
"files": [
653-
"System.Security.Principal.Windows.4.0.0-beta-23024.nupkg",
654-
"System.Security.Principal.Windows.4.0.0-beta-23024.nupkg.sha512",
655-
"System.Security.Principal.Windows.nuspec",
656-
"lib/DNXCore50/System.Security.Principal.Windows.dll",
657-
"lib/net46/System.Security.Principal.Windows.dll",
658-
"ref/dotnet/System.Security.Principal.Windows.dll",
659-
"ref/dotnet/System.Security.Principal.Windows.xml",
660-
"ref/dotnet/de/System.Security.Principal.Windows.xml",
661-
"ref/dotnet/es/System.Security.Principal.Windows.xml",
662-
"ref/dotnet/fr/System.Security.Principal.Windows.xml",
663-
"ref/dotnet/it/System.Security.Principal.Windows.xml",
664-
"ref/dotnet/ja/System.Security.Principal.Windows.xml",
665-
"ref/dotnet/ko/System.Security.Principal.Windows.xml",
666-
"ref/dotnet/ru/System.Security.Principal.Windows.xml",
667-
"ref/dotnet/zh-hans/System.Security.Principal.Windows.xml",
668-
"ref/dotnet/zh-hant/System.Security.Principal.Windows.xml",
669-
"ref/net46/System.Security.Principal.Windows.dll"
670-
]
671-
},
672610
"System.Text.Encoding/4.0.0-beta-23024": {
673611
"sha512": "vk8nyuyHfyseINaZc0CHm4L4mHU5fnZV2kdA3Cgf1MD4/dMGZFjwKCKrpMr6m08j8xOzC3yE+gIadUZjWNU6oQ==",
674612
"files": [
@@ -704,31 +642,6 @@
704642
"ref/win8/_._"
705643
]
706644
},
707-
"System.Threading/4.0.10-beta-23024": {
708-
"serviceable": true,
709-
"sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
710-
"files": [
711-
"System.Threading.4.0.10-beta-23024.nupkg",
712-
"System.Threading.4.0.10-beta-23024.nupkg.sha512",
713-
"System.Threading.nuspec",
714-
"lib/DNXCore50/System.Threading.dll",
715-
"lib/net46/_._",
716-
"lib/netcore50/System.Threading.dll",
717-
"ref/dotnet/System.Threading.dll",
718-
"ref/dotnet/System.Threading.xml",
719-
"ref/dotnet/de/System.Threading.xml",
720-
"ref/dotnet/es/System.Threading.xml",
721-
"ref/dotnet/fr/System.Threading.xml",
722-
"ref/dotnet/it/System.Threading.xml",
723-
"ref/dotnet/ja/System.Threading.xml",
724-
"ref/dotnet/ko/System.Threading.xml",
725-
"ref/dotnet/ru/System.Threading.xml",
726-
"ref/dotnet/zh-hans/System.Threading.xml",
727-
"ref/dotnet/zh-hant/System.Threading.xml",
728-
"ref/net46/_._",
729-
"runtimes/win8-aot/lib/netcore50/System.Threading.dll"
730-
]
731-
},
732645
"System.Threading.Tasks/4.0.0-beta-23024": {
733646
"sha512": "V8RvBqSDZ1cfuWSR16NBaiAkzswGPOWThL317TLCRH4llAvG6+TBOYKvRcXZgVCyahjdjDK4kPX5NUirqm4z4g==",
734647
"files": [
@@ -873,13 +786,13 @@
873786
},
874787
"projectFileDependencyGroups": {
875788
"": [
789+
"System.Diagnostics.Debug >= 4.0.10-beta-*",
876790
"System.Reflection >= 4.0.10-beta-*",
877791
"System.Runtime >= 4.0.20-beta-*",
878792
"System.Runtime.Handles >= 4.0.0-beta-*",
879793
"System.Runtime.InteropServices >= 4.0.20-beta-*",
880794
"System.Collections >= 4.0.10-beta-*",
881795
"System.Security.Claims >= 4.0.0-beta-*",
882-
"System.Security.Principal.Windows >= 4.0.0-beta-*",
883796
"xunit >= 2.0.0-beta5-build2785",
884797
"xunit.abstractions.netcore >= 1.0.0-prerelease",
885798
"xunit.assert >= 2.0.0-beta5-build2785",

0 commit comments

Comments
 (0)