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

Commit dc79c1c

Browse files
nguerreranguerrera
committed
Switch Metadata to package-based build
The mix of the old-style profile-based build with the new immutable package is causing intermittent build failures. This needs further investigation, but working around the problem by referencing the subset of net4.5+win8 that Metadata uses as package references.
1 parent a4c2db0 commit dc79c1c

File tree

3 files changed

+158
-9
lines changed

3 files changed

+158
-9
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<AssemblyName>System.Reflection.Metadata</AssemblyName>
1010
<DocumentationFile>$(OutputPath)System.Reflection.Metadata.xml</DocumentationFile>
1111
<RootNamespace>System.Reflection.Metadata</RootNamespace>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
1412
<FileAlignment>512</FileAlignment>
1513
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1614
<DefaultLanguage>en-US</DefaultLanguage>
@@ -161,11 +159,6 @@
161159
<Compile Include="System\Reflection\PortableExecutable\SectionHeader.cs" />
162160
<Compile Include="System\Reflection\System.Reflection.cs" />
163161
</ItemGroup>
164-
<ItemGroup>
165-
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
166-
<HintPath>$(PackagesDir)\System.Collections.Immutable.1.1.37-beta-23024\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
167-
</Reference>
168-
</ItemGroup>
169162
<ItemGroup>
170163
<None Include="project.json" />
171164
</ItemGroup>

‎src/System.Reflection.Metadata/src/project.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{
22
"dependencies": {
3-
"System.Collections.Immutable": "1.1.37-beta-*"
3+
"System.Runtime" : "4.0.0-beta-*",
4+
"System.Resources.ResourceManager" : "4.0.0-beta-*",
5+
"System.Reflection.Primitives" : "4.0.0-beta-*",
6+
"System.Diagnostics.Debug" : "4.0.0-beta-*",
7+
"System.IO" : "4.0.0-beta-*",
8+
"System.Collections.Immutable" : "1.1.37-beta-*",
9+
"System.Collections" : "4.0.0-beta-*",
10+
"System.Text.Encoding" : "4.0.0-beta-*",
11+
"System.Runtime.InteropServices" : "4.0.0-beta-*",
12+
"System.Reflection" : "4.0.0-beta-*",
13+
"System.Runtime.Extensions" : "4.0.0-beta-*",
14+
"System.Threading" : "4.0.0-beta-*",
15+
"System.Text.Encoding.Extensions" : "4.0.0-beta-*",
16+
"System.Reflection.Extensions" : "4.0.0-beta-*",
417
},
518
"frameworks": {
619
"dnxcore50": {}

‎src/System.Reflection.Metadata/src/project.lock.json

Lines changed: 144 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,18 @@
8080
"ref/dotnet/System.Reflection.dll": {}
8181
}
8282
},
83+
"System.Reflection.Extensions/4.0.0-beta-23024": {
84+
"dependencies": {
85+
"System.Runtime": "4.0.0-beta-23024",
86+
"System.Reflection": "4.0.0-beta-23024"
87+
},
88+
"compile": {
89+
"ref/dotnet/System.Reflection.Extensions.dll": {}
90+
},
91+
"runtime": {
92+
"lib/DNXCore50/System.Reflection.Extensions.dll": {}
93+
}
94+
},
8395
"System.Reflection.Primitives/4.0.0-beta-23024": {
8496
"dependencies": {
8597
"System.Runtime": "4.0.0-beta-23024"
@@ -117,6 +129,16 @@
117129
"ref/dotnet/System.Runtime.Extensions.dll": {}
118130
}
119131
},
132+
"System.Runtime.InteropServices/4.0.0-beta-23024": {
133+
"dependencies": {
134+
"System.Reflection": "4.0.0-beta-23024",
135+
"System.Reflection.Primitives": "4.0.0-beta-23024",
136+
"System.Runtime": "4.0.0-beta-23024"
137+
},
138+
"compile": {
139+
"ref/dotnet/System.Runtime.InteropServices.dll": {}
140+
}
141+
},
120142
"System.Text.Encoding/4.0.0-beta-23024": {
121143
"dependencies": {
122144
"System.Runtime": "4.0.0-beta-23024"
@@ -125,6 +147,15 @@
125147
"ref/dotnet/System.Text.Encoding.dll": {}
126148
}
127149
},
150+
"System.Text.Encoding.Extensions/4.0.0-beta-23024": {
151+
"dependencies": {
152+
"System.Runtime": "4.0.0-beta-23024",
153+
"System.Text.Encoding": "4.0.0-beta-23024"
154+
},
155+
"compile": {
156+
"ref/dotnet/System.Text.Encoding.Extensions.dll": {}
157+
}
158+
},
128159
"System.Threading/4.0.0-beta-23024": {
129160
"dependencies": {
130161
"System.Runtime": "4.0.0-beta-23024",
@@ -361,6 +392,35 @@
361392
"ref/win8/_._"
362393
]
363394
},
395+
"System.Reflection.Extensions/4.0.0-beta-23024": {
396+
"serviceable": true,
397+
"sha512": "Hb/Jq24QyHQ563tCB8C7qu5MlOsCc3NSopzvWAf2pU0CN0LnWH1M5W30TnVERBFWo46TJih5+IxGYhjtUU3b3A==",
398+
"files": [
399+
"System.Reflection.Extensions.4.0.0-beta-23024.nupkg",
400+
"System.Reflection.Extensions.4.0.0-beta-23024.nupkg.sha512",
401+
"System.Reflection.Extensions.nuspec",
402+
"lib/DNXCore50/System.Reflection.Extensions.dll",
403+
"lib/net45/_._",
404+
"lib/netcore50/System.Reflection.Extensions.dll",
405+
"lib/win8/_._",
406+
"ref/dotnet/System.Reflection.Extensions.dll",
407+
"ref/dotnet/System.Reflection.Extensions.xml",
408+
"ref/dotnet/de/System.Reflection.Extensions.xml",
409+
"ref/dotnet/es/System.Reflection.Extensions.xml",
410+
"ref/dotnet/fr/System.Reflection.Extensions.xml",
411+
"ref/dotnet/it/System.Reflection.Extensions.xml",
412+
"ref/dotnet/ja/System.Reflection.Extensions.xml",
413+
"ref/dotnet/ko/System.Reflection.Extensions.xml",
414+
"ref/dotnet/ru/System.Reflection.Extensions.xml",
415+
"ref/dotnet/zh-hans/System.Reflection.Extensions.xml",
416+
"ref/dotnet/zh-hant/System.Reflection.Extensions.xml",
417+
"ref/net45/_._",
418+
"ref/netcore50/System.Reflection.Extensions.dll",
419+
"ref/netcore50/System.Reflection.Extensions.xml",
420+
"ref/win8/_._",
421+
"runtimes/win8-aot/lib/netcore50/System.Reflection.Extensions.dll"
422+
]
423+
},
364424
"System.Reflection.Primitives/4.0.0-beta-23024": {
365425
"serviceable": true,
366426
"sha512": "y2g5Rwm68Nnt3Ag+pAKLRwUifIKhm1gMy36bnU5rFrZhxg21hls93QH75HDZqXjK80leEr0BC1ajZZ+IcZvKCw==",
@@ -489,6 +549,41 @@
489549
"ref/win8/_._"
490550
]
491551
},
552+
"System.Runtime.InteropServices/4.0.0-beta-23024": {
553+
"sha512": "9+ssz4Pj7jlmrV9AaoXPGRqVk0pMJ+AuxDEq0xSXHFnsEbKzaU2DM4TLllLJzeGE+gT91JY3GdPKnLEoY4StKQ==",
554+
"files": [
555+
"License.rtf",
556+
"System.Runtime.InteropServices.4.0.0-beta-23024.nupkg",
557+
"System.Runtime.InteropServices.4.0.0-beta-23024.nupkg.sha512",
558+
"System.Runtime.InteropServices.nuspec",
559+
"lib/net45/_._",
560+
"lib/win8/_._",
561+
"ref/dotnet/System.Runtime.InteropServices.dll",
562+
"ref/dotnet/System.Runtime.InteropServices.xml",
563+
"ref/dotnet/de/System.Runtime.InteropServices.xml",
564+
"ref/dotnet/es/System.Runtime.InteropServices.xml",
565+
"ref/dotnet/fr/System.Runtime.InteropServices.xml",
566+
"ref/dotnet/it/System.Runtime.InteropServices.xml",
567+
"ref/dotnet/ja/System.Runtime.InteropServices.xml",
568+
"ref/dotnet/ko/System.Runtime.InteropServices.xml",
569+
"ref/dotnet/ru/System.Runtime.InteropServices.xml",
570+
"ref/dotnet/zh-hans/System.Runtime.InteropServices.xml",
571+
"ref/dotnet/zh-hant/System.Runtime.InteropServices.xml",
572+
"ref/net45/_._",
573+
"ref/netcore50/System.Runtime.InteropServices.dll",
574+
"ref/netcore50/System.Runtime.InteropServices.xml",
575+
"ref/netcore50/de/System.Runtime.InteropServices.xml",
576+
"ref/netcore50/es/System.Runtime.InteropServices.xml",
577+
"ref/netcore50/fr/System.Runtime.InteropServices.xml",
578+
"ref/netcore50/it/System.Runtime.InteropServices.xml",
579+
"ref/netcore50/ja/System.Runtime.InteropServices.xml",
580+
"ref/netcore50/ko/System.Runtime.InteropServices.xml",
581+
"ref/netcore50/ru/System.Runtime.InteropServices.xml",
582+
"ref/netcore50/zh-hans/System.Runtime.InteropServices.xml",
583+
"ref/netcore50/zh-hant/System.Runtime.InteropServices.xml",
584+
"ref/win8/_._"
585+
]
586+
},
492587
"System.Text.Encoding/4.0.0-beta-23024": {
493588
"sha512": "vk8nyuyHfyseINaZc0CHm4L4mHU5fnZV2kdA3Cgf1MD4/dMGZFjwKCKrpMr6m08j8xOzC3yE+gIadUZjWNU6oQ==",
494589
"files": [
@@ -524,6 +619,41 @@
524619
"ref/win8/_._"
525620
]
526621
},
622+
"System.Text.Encoding.Extensions/4.0.0-beta-23024": {
623+
"sha512": "MYIsQiP4rSNxEgm+YVzViMp3H5qJewyPjvHE4crqQJGCF7JgwRMwueDeWFbpm2bouykrPculvWkRxzGoTdsEww==",
624+
"files": [
625+
"License.rtf",
626+
"System.Text.Encoding.Extensions.4.0.0-beta-23024.nupkg",
627+
"System.Text.Encoding.Extensions.4.0.0-beta-23024.nupkg.sha512",
628+
"System.Text.Encoding.Extensions.nuspec",
629+
"lib/net45/_._",
630+
"lib/win8/_._",
631+
"ref/dotnet/System.Text.Encoding.Extensions.dll",
632+
"ref/dotnet/System.Text.Encoding.Extensions.xml",
633+
"ref/dotnet/de/System.Text.Encoding.Extensions.xml",
634+
"ref/dotnet/es/System.Text.Encoding.Extensions.xml",
635+
"ref/dotnet/fr/System.Text.Encoding.Extensions.xml",
636+
"ref/dotnet/it/System.Text.Encoding.Extensions.xml",
637+
"ref/dotnet/ja/System.Text.Encoding.Extensions.xml",
638+
"ref/dotnet/ko/System.Text.Encoding.Extensions.xml",
639+
"ref/dotnet/ru/System.Text.Encoding.Extensions.xml",
640+
"ref/dotnet/zh-hans/System.Text.Encoding.Extensions.xml",
641+
"ref/dotnet/zh-hant/System.Text.Encoding.Extensions.xml",
642+
"ref/net45/_._",
643+
"ref/netcore50/System.Text.Encoding.Extensions.dll",
644+
"ref/netcore50/System.Text.Encoding.Extensions.xml",
645+
"ref/netcore50/de/System.Text.Encoding.Extensions.xml",
646+
"ref/netcore50/es/System.Text.Encoding.Extensions.xml",
647+
"ref/netcore50/fr/System.Text.Encoding.Extensions.xml",
648+
"ref/netcore50/it/System.Text.Encoding.Extensions.xml",
649+
"ref/netcore50/ja/System.Text.Encoding.Extensions.xml",
650+
"ref/netcore50/ko/System.Text.Encoding.Extensions.xml",
651+
"ref/netcore50/ru/System.Text.Encoding.Extensions.xml",
652+
"ref/netcore50/zh-hans/System.Text.Encoding.Extensions.xml",
653+
"ref/netcore50/zh-hant/System.Text.Encoding.Extensions.xml",
654+
"ref/win8/_._"
655+
]
656+
},
527657
"System.Threading/4.0.0-beta-23024": {
528658
"sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
529659
"files": [
@@ -597,7 +727,20 @@
597727
},
598728
"projectFileDependencyGroups": {
599729
"": [
600-
"System.Collections.Immutable >= 1.1.37-beta-*"
730+
"System.Runtime >= 4.0.0-beta-*",
731+
"System.Resources.ResourceManager >= 4.0.0-beta-*",
732+
"System.Reflection.Primitives >= 4.0.0-beta-*",
733+
"System.Diagnostics.Debug >= 4.0.0-beta-*",
734+
"System.IO >= 4.0.0-beta-*",
735+
"System.Collections.Immutable >= 1.1.37-beta-*",
736+
"System.Collections >= 4.0.0-beta-*",
737+
"System.Text.Encoding >= 4.0.0-beta-*",
738+
"System.Runtime.InteropServices >= 4.0.0-beta-*",
739+
"System.Reflection >= 4.0.0-beta-*",
740+
"System.Runtime.Extensions >= 4.0.0-beta-*",
741+
"System.Threading >= 4.0.0-beta-*",
742+
"System.Text.Encoding.Extensions >= 4.0.0-beta-*",
743+
"System.Reflection.Extensions >= 4.0.0-beta-*"
601744
],
602745
"DNXCore,Version=v5.0": []
603746
}

0 commit comments

Comments
 (0)