Skip to content

Commit

Permalink
Update to Fody 5.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
greuelpirat committed Jun 7, 2019
1 parent aedc42e commit 00384e5
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 97 deletions.
54 changes: 4 additions & 50 deletions AnotherAssembly/AnotherAssembly.csproj
Original file line number Diff line number Diff line change
@@ -1,53 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D7FF809D-FA0F-4183-87FE-E154B2B6ABD1}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AnotherAssembly</RootNamespace>
<AssemblyName>AnotherAssembly</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>net46;netcoreapp2.2</TargetFrameworks>
<DisableFody>true</DisableFody>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ClassFromAnotherAssembly.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
</Project>
35 changes: 0 additions & 35 deletions AnotherAssembly/Properties/AssemblyInfo.cs

This file was deleted.

2 changes: 1 addition & 1 deletion AssemblyToProcess/AssemblyToProcess.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.2</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
<DisableFody>true</DisableFody>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions DeepCopy.Fody/DeepCopy.Fody.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FodyHelpers" Version="4.2.1" />
<PackageReference Include="FodyHelpers" Version="5.0.6" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions DeepCopy.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.572
MinimumVisualStudioVersion = 10.0.40219.1
# Visual Studio Version 16
VisualStudioVersion = 16.0.28721.148
MinimumVisualStudioVersion = 16.0.28721.148
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeepCopy.Fody", "DeepCopy.Fody\DeepCopy.Fody.csproj", "{5119657D-E83E-410A-840D-3926E8A05C89}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeepCopy", "DeepCopy\DeepCopy.csproj", "{01544AA5-F19E-44F3-8D7C-3946EB9E6139}"
Expand Down
6 changes: 3 additions & 3 deletions DeepCopy/DeepCopy.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<Authors>Oliver Ehrenmüller</Authors>
Expand All @@ -14,7 +14,7 @@
<PackageIconUrl>https://github.com/greuelpirat/DeepCopy/blob/master/package_icon.png</PackageIconUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="4.2.1" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="4.2.1" PrivateAssets="All" />
<PackageReference Include="Fody" Version="5.0.6" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="5.0.6" PrivateAssets="All" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions SmokeTest/SmokeTest.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net472;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fody" Version="4.2.1">
<PackageReference Include="Fody" Version="5.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectReference Include="..\DeepCopy.Fody\DeepCopy.Fody.csproj" />
<ProjectReference Include="..\DeepCopy\DeepCopy.csproj" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="FodyHelpers" Version="4.2.1" />
<PackageReference Include="FodyHelpers" Version="5.0.6" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<ProjectReference Include="..\AssemblyToProcess\AssemblyToProcess.csproj" />
Expand Down

0 comments on commit 00384e5

Please sign in to comment.