Added the costura fody target for embedding assemblies.

Atvaark · Aug 11, 2015 · 46071b4 · 46071b4
1 parent c9270c7
commit 46071b4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/W3SavegameEditor/FodyWeavers.xml b/W3SavegameEditor/FodyWeavers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<Costura/>
+</Weavers>
diff --git a/W3SavegameEditor/Properties/AssemblyInfo.cs b/W3SavegameEditor/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
     ResourceDictionaryLocation.None, 
     ResourceDictionaryLocation.SourceAssembly
 )]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/W3SavegameEditor/ViewModels/SavegameViewModel.cs b/W3SavegameEditor/ViewModels/SavegameViewModel.cs
@@ -118,8 +118,16 @@ private void ExecuteInitializeSavegameList(object obj)
 
         private void ExecuteOpenSavegame(object parameter)
         {
+            if (parameter == null)
+            {
+                return;
+            }
+
             var savegame = parameter as SavegameModel;
-            if (savegame == null) throw new ArgumentNullException("parameter");
+            if (savegame == null)
+            {
+                throw new ArgumentException("parameter");
+            }
 
             SavegameFile.ReadAsync(savegame.Path, new OpenSavegameProgress(this))
                 .ContinueWith(t =>

diff --git a/W3SavegameEditor/W3SavegameEditor.csproj b/W3SavegameEditor/W3SavegameEditor.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <NuGetPackageImportStamp>e7a7c5c5</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -110,7 +111,17 @@
       <Name>W3SavegameEditor.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="FodyWeavers.xml" />
+  </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')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Aktivieren Sie die Wiederherstellung von NuGet-Paketen, um die fehlende Datei herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{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>
   <!-- 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">

diff --git a/W3SavegameEditor/packages.config b/W3SavegameEditor/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Fody" version="1.28.3" targetFramework="net45" developmentDependency="true" />
   <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net45" />
 </packages>