Skip to content

Commit 106d955

Browse files
tmattmat
authored
Retarget to netstandard2.0 and net472 (#149)
* Retarget to netstandard2.0 and net472 * Use ref assemblies * Ref assemblies 1.0.0-alpha-004
1 parent ddf6d11 commit 106d955

File tree

12 files changed

+37
-33
lines changed

12 files changed

+37
-33
lines changed

‎eng/SignToolData.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"certificate": "MicrosoftSHA2",
55
"strongName": "MsSharedLib72",
66
"values": [
7-
"bin/Microsoft.DiaSymReader.Converter/netstandard1.3/Microsoft.DiaSymReader.Converter.dll",
8-
"bin/Microsoft.DiaSymReader.Converter/netstandard1.3/*/Microsoft.DiaSymReader.Converter.resources.dll",
7+
"bin/Microsoft.DiaSymReader.Converter/netstandard2.0/Microsoft.DiaSymReader.Converter.dll",
8+
"bin/Microsoft.DiaSymReader.Converter/netstandard2.0/*/Microsoft.DiaSymReader.Converter.resources.dll",
99
"bin/Microsoft.DiaSymReader.Converter/net45/Microsoft.DiaSymReader.Converter.dll",
1010
"bin/Microsoft.DiaSymReader.Converter/net45/*/Microsoft.DiaSymReader.Converter.resources.dll",
11-
"bin/Microsoft.DiaSymReader.Converter.Xml/netstandard1.3/Microsoft.DiaSymReader.Converter.Xml.dll",
12-
"bin/Microsoft.DiaSymReader.Converter.Xml/netstandard1.3/*/Microsoft.DiaSymReader.Converter.Xml.resources.dll",
13-
"bin/Pdb2Pdb/net46/Pdb2Pdb.exe",
14-
"bin/Pdb2Pdb/net46/*/Pdb2Pdb.resources.dll",
15-
"bin/Pdb2Xml/net46/Pdb2Xml.exe"
11+
"bin/Microsoft.DiaSymReader.Converter.Xml/netstandard2.0/Microsoft.DiaSymReader.Converter.Xml.dll",
12+
"bin/Microsoft.DiaSymReader.Converter.Xml/netstandard2.0/*/Microsoft.DiaSymReader.Converter.Xml.resources.dll",
13+
"bin/Pdb2Pdb/net472/Pdb2Pdb.exe",
14+
"bin/Pdb2Pdb/net472/*/Pdb2Pdb.resources.dll",
15+
"bin/Pdb2Xml/net472/Pdb2Xml.exe"
1616
]
1717
},
1818
{

‎eng/Versions.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,18 @@
1515
<MicrosoftDiaSymReaderPortablePdbVersion>1.5.0</MicrosoftDiaSymReaderPortablePdbVersion>
1616
<MicrosoftMetadataVisualizerVersion>1.0.0-beta1-63011-01</MicrosoftMetadataVisualizerVersion>
1717
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
18+
<MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesVersion>
1819

1920
<!-- CoreFX -->
2021
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
2122
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
2223
<SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
2324
</PropertyGroup>
2425

26+
<PropertyGroup>
27+
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
28+
</PropertyGroup>
29+
2530
<PropertyGroup>
2631
<RestoreSources>
2732
$(RestoreSources);

‎src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp2.0</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<!--
77
We would need to download 32bit dotnet cli, which would add extra time to PR runs
88
Testing 64bit only on Desktop suffixiently covers our interop code paths.
99
-->
10-
<TestArchitectures Condition="'$(TargetFramework)' == 'net46'">x64;x86</TestArchitectures>
10+
<TestArchitectures Condition="'$(TargetFramework)' == 'net472'">x64;x86</TestArchitectures>
1111

1212
</PropertyGroup>
1313
<ItemGroup>

‎src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFramework>netstandard1.3</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
55
<RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
55
<RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFramework>net46</TargetFramework>
4+
<TargetFramework>net472</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Pdb2Pdb/Pdb2Pdb.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFramework>net46</TargetFramework>
4+
<TargetFramework>net472</TargetFramework>
55
<RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
66
<OutputType>Exe</OutputType>
77
<LargeAddressAware>true</LargeAddressAware>

‎src/Pdb2Pdb/Pdb2Pdb.nuspec‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
</metadata>
1717
<files>
1818
<!-- Dependencies built by this repo -->
19-
<file src="..\Microsoft.DiaSymReader.Converter\net45\Microsoft.DiaSymReader.Converter.dll" target="tools" />
19+
<file src="..\Microsoft.DiaSymReader.Converter\netstandard2.0\Microsoft.DiaSymReader.Converter.dll" target="tools" />
2020
<!-- External dependencies -->
21-
<file src="net46\Newtonsoft.Json.dll" target="tools" />
22-
<file src="net46\Microsoft.DiaSymReader.dll" target="tools" />
23-
<file src="net46\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
24-
<file src="net46\System.*.dll" target="tools" />
25-
<file src="net46\*.exe" target="tools" />
26-
<file src="net46\*.exe.config" target="tools" />
27-
<file src="net46\**\*.resources.dll" target="tools" />
21+
<file src="net472\Newtonsoft.Json.dll" target="tools" />
22+
<file src="net472\Microsoft.DiaSymReader.dll" target="tools" />
23+
<file src="net472\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
24+
<file src="net472\System.*" target="tools" />
25+
<file src="net472\*.exe" target="tools" />
26+
<file src="net472\*.exe.config" target="tools" />
27+
<file src="net472\**\*.resources.dll" target="tools" />
2828
</files>
2929
</package>

‎src/Pdb2Xml/Pdb2Xml.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project Sdk="RoslynTools.RepoToolset">
33
<PropertyGroup>
4-
<TargetFramework>net46</TargetFramework>
4+
<TargetFramework>net472</TargetFramework>
55
<RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
66
<OutputType>Exe</OutputType>
77
<LargeAddressAware>true</LargeAddressAware>

‎src/Pdb2Xml/Pdb2Xml.nuspec‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
</metadata>
1717
<files>
1818
<!-- Dependencies built by this repo -->
19-
<file src="..\Microsoft.DiaSymReader.Converter.Xml\netstandard1.3\Microsoft.DiaSymReader.Converter.Xml.dll" target="tools" />
19+
<file src="..\Microsoft.DiaSymReader.Converter.Xml\netstandard2.0\Microsoft.DiaSymReader.Converter.Xml.dll" target="tools" />
2020
<!-- External dependencies -->
21-
<file src="net46\Microsoft.DiaSymReader.dll" target="tools" />
22-
<file src="net46\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
23-
<file src="net46\Microsoft.DiaSymReader.PortablePdb.dll" target="tools" />
24-
<file src="net46\Microsoft.Win32.*.dll" target="tools" />
25-
<file src="net46\System.*.dll" target="tools" />
26-
<file src="net46\*.exe" target="tools" />
27-
<file src="net46\*.exe.config" target="tools" />
28-
<file src="net46\**\*.resources.dll" target="tools" />
21+
<file src="net472\Microsoft.DiaSymReader.dll" target="tools" />
22+
<file src="net472\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
23+
<file src="net472\Microsoft.DiaSymReader.PortablePdb.dll" target="tools" />
24+
<file src="net472\System.*" target="tools" />
25+
<file src="net472\*.exe" target="tools" />
26+
<file src="net472\*.exe.config" target="tools" />
27+
<file src="net472\**\*.resources.dll" target="tools" />
2928
</files>
3029
</package>

0 commit comments

Comments
 (0)