Skip to content

Commit

Permalink
Merge pull request #163 from hcmlab/develop
Browse files Browse the repository at this point in the history
readded fody dependency
  • Loading branch information
tobiasbaur authored Mar 6, 2017
2 parents 2d441e4 + f2ebe17 commit 0aaf74e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura />
<Costura/>

</Weavers>
Binary file modified bin/nova.exe
Binary file not shown.
10 changes: 10 additions & 0 deletions nova.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup>
<StartupObject>ssi.App</StartupObject>
Expand Down Expand Up @@ -466,6 +468,7 @@
</EmbeddedResource>
<None Include="app.config" />
<None Include="App\App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -487,4 +490,11 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\Packages\Fody.1.28.3\build\Fody.targets" Condition="Exists('..\..\Packages\Fody.1.28.3\build\Fody.targets')" />
<Import Project="packages\Fody.1.28.3\build\Fody.targets" Condition="Exists('packages\Fody.1.28.3\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\Fody.1.28.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.1.28.3\build\Fody.targets'))" />
</Target>
</Project>
5 changes: 5 additions & 0 deletions packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net461" developmentDependency="true" />
<package id="Fody" version="1.28.3" targetFramework="net461" developmentDependency="true" />
</packages>

0 comments on commit 0aaf74e

Please sign in to comment.