Skip to content

Commit

Permalink
Updated Fody - the plugin now builds and RUNS in VS2015.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmemcpy
hmemcpy committed May 7, 2015
1 parent ed2c4d2 commit 1a9dcc1
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 136 deletions.
3 changes: 0 additions & 3 deletions SaveAllTheTime.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAllTheTime.Tests", "Sav
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BDBFBCD2-1D1D-4F6D-8868-6085A741AC64}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
.nuget\packages.config = .nuget\packages.config
EndProjectSection
EndProject
Expand Down
89 changes: 0 additions & 89 deletions SaveAllTheTime/Fody.targets
View file

This file was deleted.

3 changes: 2 additions & 1 deletion SaveAllTheTime/FodyWeavers.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<Weavers>
<ModuleInit />

</Weavers>
3 changes: 1 addition & 2 deletions SaveAllTheTime/ModuleInitializer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Reactive.Concurrency;
using ReactiveUI;

/// <summary>
/// <summary>
/// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.
/// </summary>
public static class ModuleInitializer
Expand Down
12 changes: 9 additions & 3 deletions SaveAllTheTime/SaveAllTheTime.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<FodyPath>..\packages\Fody.1.19.1.0</FodyPath>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -239,7 +240,6 @@
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="app.config" />
<None Include="Fody.targets" />
<None Include="packages.config" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
Expand Down Expand Up @@ -273,7 +273,13 @@ xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.14.1.0\lib\net35\NativeBinari
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.14.1.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
</PropertyGroup>
<Import Project="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>
<!-- 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">
Expand Down
76 changes: 38 additions & 38 deletions SaveAllTheTime/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Fody" version="1.19.1.0" targetFramework="net45" developmentDependency="true" />
<package id="LibGit2Sharp" version="0.14.1.0" targetFramework="net45" />
<package id="ModuleInit.Fody" version="1.5.5.0" targetFramework="net45" developmentDependency="true" />
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
<package id="NLog" version="2.0.1.2" targetFramework="net45" />
<package id="reactiveui-core" version="5.4.0" targetFramework="net45" />
<package id="reactiveui-nlog" version="5.4.0" targetFramework="net45" />
<package id="reactiveui-platforms" version="5.4.0" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214" targetFramework="net45" />
<package id="Rx-Main" version="2.1.30214" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.1.30214" targetFramework="net45" />
<package id="Rx-XAML" version="2.1.30214" targetFramework="net45" />
<package id="VSSDK.CoreUtility" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.CoreUtility.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" />
<package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
<package id="VSSDK.Language" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.Language.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net45" />
<package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" />
<package id="VSSDK.Text" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.Text.11" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" />
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
<package id="Fody" version="1.28.3" targetFramework="net45" userInstalled="true" />
<package id="LibGit2Sharp" version="0.14.1.0" targetFramework="net45" userInstalled="true" />
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" userInstalled="true" />
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" userInstalled="true" />
<package id="NLog" version="2.0.1.2" targetFramework="net45" userInstalled="true" />
<package id="reactiveui-core" version="5.4.0" targetFramework="net45" userInstalled="true" />
<package id="reactiveui-nlog" version="5.4.0" targetFramework="net45" userInstalled="true" />
<package id="reactiveui-platforms" version="5.4.0" targetFramework="net45" userInstalled="true" />
<package id="Rx-Core" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="Rx-Interfaces" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="Rx-Linq" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="Rx-Main" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="Rx-PlatformServices" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="Rx-XAML" version="2.1.30214" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.CoreUtility" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.CoreUtility.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Language" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Language.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Text" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.Text.11" version="11.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" userInstalled="true" />
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" userInstalled="true" />
</packages>

0 comments on commit 1a9dcc1

Please sign in to comment.