update to Net472

Fody · Mar 25, 2019 · c8f1af8 · c8f1af8
1 parent b6b867f
commit c8f1af8
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 37 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>4.2.1</Version>
+    <Version>5.0.0-beta.1</Version>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>latest</LangVersion>
     <NoWarn>CS1591</NoWarn>
@@ -26,11 +26,11 @@
   </Target>
 
   <ItemGroup>
-    <WeaverFiles Include="$(SolutionDir)SampleWeaver.Fody\bin\$(Configuration)\Net46\SampleWeaver.Fody.dll" />
+    <WeaverFiles Include="$(SolutionDir)SampleWeaver.Fody\bin\$(Configuration)\Net472\SampleWeaver.Fody.dll" />
   </ItemGroup>
 
   <PropertyGroup>
-    <FodyAssembly>$(SolutionDir)Fody\bin\$(Configuration)\Net46\Fody.dll</FodyAssembly>
+    <FodyAssembly>$(SolutionDir)Fody\bin\$(Configuration)\Net472\Fody.dll</FodyAssembly>
   </PropertyGroup>
 
 </Project>
diff --git a/DummyAssembly/DummyAssembly.csproj b/DummyAssembly/DummyAssembly.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 </Project>
diff --git a/Fody/Fody.csproj b/Fody/Fody.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <Description>Extensible tool for weaving .net assemblies.</Description>
@@ -23,7 +23,7 @@
   <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" PrivateAssets="All" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net46'">
+  <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Tasks.v4.0" />

diff --git a/Fody/Fody.nuspec b/Fody/Fody.nuspec
@@ -14,10 +14,10 @@
     <tags>$tags$</tags>
   </metadata>
   <files>
-    <file src=".\bin\$configuration$\net46\Fody*.dll" target="netclassictask" />
-    <file src=".\bin\$configuration$\net46\Mono*.dll" target="netclassictask" />
-    <file src=".\bin\$configuration$\net46\Fody*.pdb" target="netclassictask" />
-    <file src=".\bin\$configuration$\net46\Mono*.pdb" target="netclassictask" />
+    <file src=".\bin\$configuration$\net472\Fody*.dll" target="netclassictask" />
+    <file src=".\bin\$configuration$\net472\Mono*.dll" target="netclassictask" />
+    <file src=".\bin\$configuration$\net472\Fody*.pdb" target="netclassictask" />
+    <file src=".\bin\$configuration$\net472\Mono*.pdb" target="netclassictask" />
     <file src=".\bin\$configuration$\netstandard2.0\Fody*.dll" target="netstandardtask" />
     <file src=".\bin\$configuration$\netstandard2.0\Mono*.dll" target="netstandardtask" />
     <file src=".\bin\$configuration$\netstandard2.0\Fody*.pdb" target="netstandardtask" />

diff --git a/FodyCommon/FodyCommon.csproj b/FodyCommon/FodyCommon.csproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)Key.snk</AssemblyOriginatorKeyFile>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net46'">
+  <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="Mono.Cecil" HintPath="..\Lib\Cecil\net40\Mono.Cecil.dll" />
     <Reference Include="Mono.Cecil.Mdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Mdb.dll" />
     <Reference Include="Mono.Cecil.Pdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Pdb.dll" />

diff --git a/FodyCommon/IsolatedAssemblyLoadContext.cs b/FodyCommon/IsolatedAssemblyLoadContext.cs
@@ -1,4 +1,4 @@
-#if NET46
+#if NET472
 using System;
 public class IsolatedAssemblyLoadContext
 {

diff --git a/FodyHelpers/FodyHelpers.csproj b/FodyHelpers/FodyHelpers.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile Condition="'$(Configuration)'=='Release'">true</GenerateDocumentationFile>
@@ -10,7 +10,7 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net46'">
+  <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="Mono.Cecil" HintPath="..\Lib\Cecil\net40\Mono.Cecil.dll" />
     <Reference Include="Mono.Cecil.Mdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Mdb.dll" />
     <Reference Include="Mono.Cecil.Pdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Pdb.dll" />

diff --git a/FodyIsolated/FodyIsolated.csproj b/FodyIsolated/FodyIsolated.csproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)Key.snk</AssemblyOriginatorKeyFile>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <ItemGroup Condition="$(TargetFramework) == 'net46'">
+  <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="Mono.Cecil" HintPath="..\Lib\Cecil\net40\Mono.Cecil.dll" />
     <Reference Include="Mono.Cecil.Mdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Mdb.dll" />
     <Reference Include="Mono.Cecil.Pdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Pdb.dll" />

diff --git a/FodyIsolated/InnerWeaver.cs b/FodyIsolated/InnerWeaver.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-#if NET46
+#if NET472
 using System.Runtime.Remoting;
 #endif
 using Fody;
@@ -14,7 +14,6 @@
 using Mono.Cecil.Rocks;
 using FieldAttributes = Mono.Cecil.FieldAttributes;
 using TypeAttributes = Mono.Cecil.TypeAttributes;
-#pragma warning disable 618
 
 public partial class InnerWeaver : MarshalByRefObject, IInnerWeaver
 {
@@ -292,7 +291,7 @@ public sealed override object InitializeLifetimeService()
 
     public void Dispose()
     {
-#if NET46
+#if NET472
         //Disconnects the remoting channel(s) of this object and all nested objects.
         RemotingServices.Disconnect(this);
 #endif

diff --git a/FodyPackaging/FodyPackaging.csproj b/FodyPackaging/FodyPackaging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <Description>NuGet packaging Fody repositories</Description>
     <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/Integration/SampleTargetTests/SampleTargetTests.csproj b/Integration/SampleTargetTests/SampleTargetTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/Integration/Tests/Tests.csproj b/Integration/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />

diff --git a/Integration/Weavers/Weavers.csproj b/Integration/Weavers/Weavers.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Integration/WithDelaySigning/WithDelaySigning.csproj b/Integration/WithDelaySigning/WithDelaySigning.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>public.snk</AssemblyOriginatorKeyFile>

diff --git a/Integration/WithEmbeddedPdb/WithEmbeddedPdb.csproj b/Integration/WithEmbeddedPdb/WithEmbeddedPdb.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/Integration/WithNoPdb/WithNoPdb.csproj b/Integration/WithNoPdb/WithNoPdb.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="$(IntegrationVersion)" />

diff --git a/Integration/WithNugetAndInSolutionWeavers/WithNugetAndInSolutionWeavers.csproj b/Integration/WithNugetAndInSolutionWeavers/WithNugetAndInSolutionWeavers.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="$(IntegrationVersion)" />

diff --git a/Integration/WithNugetWeavers/WithNugetWeavers.csproj b/Integration/WithNugetWeavers/WithNugetWeavers.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Integration/WithOnlyInSolutionWeaver/WithOnlyInSolutionWeaver.csproj b/Integration/WithOnlyInSolutionWeaver/WithOnlyInSolutionWeaver.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Fody" Version="$(IntegrationVersion)" />

diff --git a/SampleWeaver.Fody/SampleWeaver.Fody.csproj b/SampleWeaver.Fody/SampleWeaver.Fody.csproj
@@ -2,12 +2,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <Import Project="..\FodyHelpers\build\FodyHelpers.props" />
 
-  <ItemGroup Condition="$(TargetFramework) == 'net46'">
+  <ItemGroup Condition="$(TargetFramework) == 'net472'">
     <Reference Include="Mono.Cecil" HintPath="..\Lib\Cecil\net40\Mono.Cecil.dll" />
     <Reference Include="Mono.Cecil.Mdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Mdb.dll" />
     <Reference Include="Mono.Cecil.Pdb" HintPath="..\Lib\Cecil\net40\Mono.Cecil.Pdb.dll" />

diff --git a/SampleWeaver/SampleWeaver.csproj b/SampleWeaver/SampleWeaver.csproj
@@ -8,7 +8,7 @@
   <Import Project="..\FodyPackaging\build\FodyPackaging.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net40</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <Import Project="..\FodyPackaging\build\FodyPackaging.targets" />

diff --git a/Tests/FodyHelpers/IldasmTests.Verify.DebugNet_4.7.Net_4.7.approved.txt b/Tests/FodyHelpers/IldasmTests.Verify.DebugNet_4.7.Net_4.7.approved.txt
@@ -6,10 +6,10 @@
 .assembly DummyAssembly
 {
 63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 )       // ceptionThrows.
-2C 56 65 72 73 69 6F 6E 3D 76 34 2E 36 01 00 54   // ,Version=v4.6..T
-0E 14 46 72 61 6D 65 77 6F 72 6B 44 69 73 70 6C   // ..FrameworkDispl
-61 79 4E 61 6D 65 12 2E 4E 45 54 20 46 72 61 6D   // ayName..NET Fram
-65 77 6F 72 6B 20 34 2E 36 )                      // ework 4.6
+2C 56 65 72 73 69 6F 6E 3D 76 34 2E 37 2E 32 01   // ,Version=v4.7.2.
+00 54 0E 14 46 72 61 6D 65 77 6F 72 6B 44 69 73   // .T..FrameworkDis
+70 6C 61 79 4E 61 6D 65 14 2E 4E 45 54 20 46 72   // playName..NET Fr
+61 6D 65 77 6F 72 6B 20 34 2E 37 2E 32 )          // amework 4.7.2
 .hash algorithm 0x00008004
 .ver 0:0:0:0
 }