Retarget to netstandard2.0 and net472 (#149)

* Retarget to netstandard2.0 and net472 * Use ref assemblies * Ref assemblies 1.0.0-alpha-004
dotnet · Sep 14, 2018 · 106d955 · 106d955
1 parent ddf6d11
commit 106d955
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 33 deletions.
diff --git a/eng/SignToolData.json b/eng/SignToolData.json
@@ -4,15 +4,15 @@
       "certificate": "MicrosoftSHA2",
       "strongName": "MsSharedLib72",
       "values": [
-        "bin/Microsoft.DiaSymReader.Converter/netstandard1.3/Microsoft.DiaSymReader.Converter.dll",
-        "bin/Microsoft.DiaSymReader.Converter/netstandard1.3/*/Microsoft.DiaSymReader.Converter.resources.dll",
+        "bin/Microsoft.DiaSymReader.Converter/netstandard2.0/Microsoft.DiaSymReader.Converter.dll",
+        "bin/Microsoft.DiaSymReader.Converter/netstandard2.0/*/Microsoft.DiaSymReader.Converter.resources.dll",
         "bin/Microsoft.DiaSymReader.Converter/net45/Microsoft.DiaSymReader.Converter.dll",
         "bin/Microsoft.DiaSymReader.Converter/net45/*/Microsoft.DiaSymReader.Converter.resources.dll",
-        "bin/Microsoft.DiaSymReader.Converter.Xml/netstandard1.3/Microsoft.DiaSymReader.Converter.Xml.dll",
-        "bin/Microsoft.DiaSymReader.Converter.Xml/netstandard1.3/*/Microsoft.DiaSymReader.Converter.Xml.resources.dll",
-        "bin/Pdb2Pdb/net46/Pdb2Pdb.exe",
-        "bin/Pdb2Pdb/net46/*/Pdb2Pdb.resources.dll",
-        "bin/Pdb2Xml/net46/Pdb2Xml.exe"
+        "bin/Microsoft.DiaSymReader.Converter.Xml/netstandard2.0/Microsoft.DiaSymReader.Converter.Xml.dll",
+        "bin/Microsoft.DiaSymReader.Converter.Xml/netstandard2.0/*/Microsoft.DiaSymReader.Converter.Xml.resources.dll",
+        "bin/Pdb2Pdb/net472/Pdb2Pdb.exe",
+        "bin/Pdb2Pdb/net472/*/Pdb2Pdb.resources.dll",
+        "bin/Pdb2Xml/net472/Pdb2Xml.exe"
       ]
     },
     {

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,13 +15,18 @@
     <MicrosoftDiaSymReaderPortablePdbVersion>1.5.0</MicrosoftDiaSymReaderPortablePdbVersion>
     <MicrosoftMetadataVisualizerVersion>1.0.0-beta1-63011-01</MicrosoftMetadataVisualizerVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
+    <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesVersion>
 
     <!-- CoreFX -->
     <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
     <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
     <SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
+  </PropertyGroup>
+
   <PropertyGroup>
     <RestoreSources>
       $(RestoreSources);

diff --git a/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj b/src/Microsoft.DiaSymReader.Converter.Tests/Microsoft.DiaSymReader.Converter.UnitTests.csproj
@@ -1,13 +1,13 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- 
       We would need to download 32bit dotnet cli, which would add extra time to PR runs 
       Testing 64bit only on Desktop suffixiently covers our interop code paths.  
     -->
-    <TestArchitectures Condition="'$(TargetFramework)' == 'net46'">x64;x86</TestArchitectures>
+    <TestArchitectures Condition="'$(TargetFramework)' == 'net472'">x64;x86</TestArchitectures>
 
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj b/src/Microsoft.DiaSymReader.Converter.Xml/Microsoft.DiaSymReader.Converter.Xml.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj b/src/Microsoft.DiaSymReader.Converter/Microsoft.DiaSymReader.Converter.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj b/src/Pdb2Pdb.Tests/Pdb2Pdb.UnitTests.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Pdb2Pdb/Pdb2Pdb.csproj b/src/Pdb2Pdb/Pdb2Pdb.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
     <OutputType>Exe</OutputType>
     <LargeAddressAware>true</LargeAddressAware>

diff --git a/src/Pdb2Pdb/Pdb2Pdb.nuspec b/src/Pdb2Pdb/Pdb2Pdb.nuspec
@@ -16,14 +16,14 @@
   </metadata>  
   <files>
     <!-- Dependencies built by this repo -->
-    <file src="..\Microsoft.DiaSymReader.Converter\net45\Microsoft.DiaSymReader.Converter.dll" target="tools" />
+    <file src="..\Microsoft.DiaSymReader.Converter\netstandard2.0\Microsoft.DiaSymReader.Converter.dll" target="tools" />
     <!-- External dependencies -->
-    <file src="net46\Newtonsoft.Json.dll" target="tools" />
-    <file src="net46\Microsoft.DiaSymReader.dll" target="tools" />
-    <file src="net46\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
-    <file src="net46\System.*.dll" target="tools" />
-    <file src="net46\*.exe" target="tools" />
-    <file src="net46\*.exe.config" target="tools" />    
-    <file src="net46\**\*.resources.dll" target="tools" />
+    <file src="net472\Newtonsoft.Json.dll" target="tools" />
+    <file src="net472\Microsoft.DiaSymReader.dll" target="tools" />
+    <file src="net472\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
+    <file src="net472\System.*" target="tools" />
+    <file src="net472\*.exe" target="tools" />
+    <file src="net472\*.exe.config" target="tools" />    
+    <file src="net472\**\*.resources.dll" target="tools" />
   </files>
 </package>
diff --git a/src/Pdb2Xml/Pdb2Xml.csproj b/src/Pdb2Xml/Pdb2Xml.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <RootNamespace>Microsoft.DiaSymReader.Tools</RootNamespace>
     <OutputType>Exe</OutputType>
     <LargeAddressAware>true</LargeAddressAware>

diff --git a/src/Pdb2Xml/Pdb2Xml.nuspec b/src/Pdb2Xml/Pdb2Xml.nuspec
@@ -16,15 +16,14 @@
   </metadata>
   <files>
     <!-- Dependencies built by this repo -->
-    <file src="..\Microsoft.DiaSymReader.Converter.Xml\netstandard1.3\Microsoft.DiaSymReader.Converter.Xml.dll" target="tools" />
+    <file src="..\Microsoft.DiaSymReader.Converter.Xml\netstandard2.0\Microsoft.DiaSymReader.Converter.Xml.dll" target="tools" />
     <!-- External dependencies -->
-    <file src="net46\Microsoft.DiaSymReader.dll" target="tools" />
-    <file src="net46\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
-    <file src="net46\Microsoft.DiaSymReader.PortablePdb.dll" target="tools" />
-    <file src="net46\Microsoft.Win32.*.dll" target="tools" />
-    <file src="net46\System.*.dll" target="tools" />
-    <file src="net46\*.exe" target="tools" />
-    <file src="net46\*.exe.config" target="tools" />
-    <file src="net46\**\*.resources.dll" target="tools" />
+    <file src="net472\Microsoft.DiaSymReader.dll" target="tools" />
+    <file src="net472\Microsoft.DiaSymReader.Native.*.dll" target="tools" />
+    <file src="net472\Microsoft.DiaSymReader.PortablePdb.dll" target="tools" />
+    <file src="net472\System.*" target="tools" />
+    <file src="net472\*.exe" target="tools" />
+    <file src="net472\*.exe.config" target="tools" />
+    <file src="net472\**\*.resources.dll" target="tools" />
   </files>
 </package>
diff --git a/src/PdbTestResources/PdbTestResources.csproj b/src/PdbTestResources/PdbTestResources.csproj
@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/TestUtilities/TestUtilities.csproj b/src/TestUtilities/TestUtilities.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="RoslynTools.RepoToolset">
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
   <ItemGroup>