Move Fody package ref to PrivateAssets None

Fody · Jan 12, 2018 · 5927d3e · 5927d3e
1 parent 2527930
commit 5927d3e
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 23 deletions.
diff --git a/AssemblyToProcess/AssemblyToProcess.csproj b/AssemblyToProcess/AssemblyToProcess.csproj
@@ -2,5 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <DisableFody>true</DisableFody>
   </PropertyGroup>
 </Project>
diff --git a/AssemblyWithExcludes/AssemblyWithExcludes.csproj b/AssemblyWithExcludes/AssemblyWithExcludes.csproj
@@ -2,5 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <DisableFody>true</DisableFody>
   </PropertyGroup>
 </Project>
diff --git a/AssemblyWithIncludes/AssemblyWithIncludes.csproj b/AssemblyWithIncludes/AssemblyWithIncludes.csproj
@@ -2,5 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <DisableFody>true</DisableFody>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <PackageVersion>1.20.1</PackageVersion>
+    <PackageVersion>1.20.2</PackageVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

diff --git a/Tests/ConfigReaderTests.cs b/Tests/ConfigReaderTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Linq;
+using Fody;
 using Xunit;
 
 public class ConfigReaderTests
 {
-
     [Fact]
     public void ExcludeNamespacesNode()
     {
@@ -122,5 +122,4 @@ public void IncludeNamespacesCombined()
         Assert.Equal("Foo", moduleWeaver.IncludeNamespaces[0]);
         Assert.Equal("Bar", moduleWeaver.IncludeNamespaces[1]);
     }
-
 }
diff --git a/Tests/NewPropertyIntegrationTests.cs b/Tests/NewPropertyIntegrationTests.cs
@@ -11,17 +11,17 @@ public class NewPropertyIntegrationTests
 
     const BindingFlags PropertyBindingFlags = BindingFlags.Public | BindingFlags.Instance;
 
-    readonly Type derivedType;
-    readonly Type genericDerivedType;
+    Type derivedType;
+    Type genericDerivedType;
 
-    readonly PropertyInfo baseProperty;
-    readonly PropertyInfo baseNewProperty;
+    PropertyInfo baseProperty;
+    PropertyInfo baseNewProperty;
 
-    readonly PropertyInfo derivedSameBackingProperty;
-    readonly PropertyInfo derivedNewProperty;
+    PropertyInfo derivedSameBackingProperty;
+    PropertyInfo derivedNewProperty;
 
-    readonly PropertyInfo genericDerivedSameBackingProperty;
-    readonly PropertyInfo genericDerivedNewProperty;
+    PropertyInfo genericDerivedSameBackingProperty;
+    PropertyInfo genericDerivedNewProperty;
 
     static Assembly assembly;
 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -3,10 +3,11 @@
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <DisableFody>true</DisableFody>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="FodyHelpers" Version="2.3.17" />
+    <PackageReference Include="FodyHelpers" Version="2.3.18" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <ProjectReference Include="..\AssemblyWithExcludes\AssemblyWithExcludes.csproj" />

diff --git a/Virtuosity.Fody/ConfigReader.cs b/Virtuosity.Fody/ConfigReader.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Fody;
 
 public partial class ModuleWeaver
 {

diff --git a/Virtuosity.Fody/Virtuosity.Fody.csproj b/Virtuosity.Fody/Virtuosity.Fody.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="FodyHelpers" Version="2.3.17" />
+    <PackageReference Include="FodyHelpers" Version="2.3.18" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>

diff --git a/Virtuosity.Fody/WeavingException.cs b/Virtuosity.Fody/WeavingException.cs
diff --git a/Virtuosity/Virtuosity.csproj b/Virtuosity/Virtuosity.csproj
@@ -9,7 +9,7 @@
     <PackageTags>Virtual, ILWeaving, Runtime Proxy, Mocking, Fody, Cecil</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Fody" Version="2.3.17" />
-    <PackageReference Include="FodyPackaging" Version="2.3.17" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="2.3.18" PrivateAssets="None" />
+    <PackageReference Include="FodyPackaging" Version="2.3.18" PrivateAssets="All" />
   </ItemGroup>
 </Project>