Skip to content

Commit

Permalink
Fix issues with repository management
Browse files Browse the repository at this point in the history
  • Loading branch information
henryvincent96 committed Nov 27, 2018
1 parent 49f68cb commit 5ea1cd3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# Created by https://www.gitignore.io/api/csharp,visualstudio,visualstudiocode
# Edit at https://www.gitignore.io/?templates=csharp,visualstudio,visualstudiocode

### Specific to this project ###
wrap_oal.dll
OpenAL32.dll

### Csharp ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
Expand Down
4 changes: 2 additions & 2 deletions MyGame/MyGame.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll</HintPath>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion MyGame/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="openal.redist" version="2.0.7.0" targetFramework="net461" />
<package id="OpenTK" version="3.0.0" targetFramework="net461" />
<package id="OpenTK" version="3.0.1" targetFramework="net461" />
</packages>
12 changes: 2 additions & 10 deletions Sloth Engine/Sloth Engine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll</HintPath>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -79,14 +79,6 @@
<None Include="OpenTK.dll.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="OpenAL32.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="wrap_oal.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\openal.redist.2.0.7.0\build\net45\openal.redist.targets" Condition="Exists('..\packages\openal.redist.2.0.7.0\build\net45\openal.redist.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
2 changes: 1 addition & 1 deletion Sloth Engine/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="openal.redist" version="2.0.7.0" targetFramework="net461" />
<package id="OpenTK" version="3.0.0" targetFramework="net452" />
<package id="OpenTK" version="3.0.1" targetFramework="net461" />
</packages>

0 comments on commit 5ea1cd3

Please sign in to comment.