Skip to content

Commit

Permalink
Fix Nuget package restore for VB2015
Browse files Browse the repository at this point in the history
  • Loading branch information
LaBlazer committed Sep 27, 2015
1 parent 308ab11 commit ce72418
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 163 deletions.
Binary file removed .nuget/NuGet.exe
Binary file not shown.
144 changes: 0 additions & 144 deletions .nuget/NuGet.targets

This file was deleted.

3 changes: 1 addition & 2 deletions UltimateFishBot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FEE29BD6-2EA3-4540-863B-2CBDAD70A553}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Global
Expand All @@ -27,3 +25,4 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

3 changes: 1 addition & 2 deletions UltimateFishBot/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura>
</Costura>
<Costura/>

</Weavers>
17 changes: 5 additions & 12 deletions UltimateFishBot/UltimateFishBot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<AssemblyName>UltimateFishBot</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>ab347462</NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand Down Expand Up @@ -56,7 +56,6 @@
<ItemGroup>
<Reference Include="CoreAudioApi">
<HintPath>Resources\CoreAudioApi.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -205,22 +204,16 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.1\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.1\build\Fody.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<Target AfterTargets="AfterBuild;NonWinFodyTarget" Name="CleanReferenceCopyLocalPaths">
<Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
</Target>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.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>

6 changes: 3 additions & 3 deletions UltimateFishBot/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Costura.Fody" version="1.3.5.0" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.29.3" targetFramework="net40" developmentDependency="true" />
</packages>
<package id="Costura.Fody" version="1.3.5.0" targetFramework="net4" developmentDependency="true" />
<package id="Fody" version="1.29.3" targetFramework="net4" developmentDependency="true" />
</packages>

0 comments on commit ce72418

Please sign in to comment.