Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update all NuGet packages to latest and fix breaking changes #13

Merged
merged 2 commits into from
Feb 21, 2018
Merged

Update all NuGet packages to latest and fix breaking changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6df911f
Update all NuGet packages to latest and fix breaking changes
robertos Feb 20, 2018
d2d8ba0
Update README.md
robertos Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The current release includes code for:
## Dependencies

This project consumes the following projects through NuGet packages:
- [Microsoft.glTF.CPP](https://www.nuget.org/packages/Microsoft.glTF.CPP/1.3.25), licensed under the MIT license
- [Microsoft.glTF.CPP](https://www.nuget.org/packages/Microsoft.glTF.CPP), licensed under the MIT license
- [DirectXTex](http://github.com/Microsoft/DirectXTex), licensed under the MIT license
- [RapidJSON](https://github.com/Tencent/rapidjson/), licensed under the MIT license

Expand Down
8 changes: 4 additions & 4 deletions WindowsMRAssetConverter/WindowsMRAssetConverter.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets" Condition="Exists('..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" />
</ImportGroup>
<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\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions WindowsMRAssetConverter/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxtex_desktop_2015" version="2017.12.13.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.26.0" targetFramework="native" />
<package id="directxtex_desktop_2015" version="2018.2.9.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.46.0" targetFramework="native" />
<package id="rapidjson.temprelease" version="0.0.2.20" targetFramework="native" />
</packages>
8 changes: 4 additions & 4 deletions glTF-Toolkit.Test/glTF-Toolkit.Test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets" Condition="Exists('..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" />
</ImportGroup>
<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\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions glTF-Toolkit.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxtex_desktop_2015" version="2017.12.13.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.26.0" targetFramework="native" />
<package id="directxtex_desktop_2015" version="2018.2.9.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.46.0" targetFramework="native" />
<package id="rapidjson.temprelease" version="0.0.2.20" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion glTF-Toolkit.UWP.Test/glTF-Toolkit.UWP.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.5</Version>
<Version>6.0.7</Version>
</PackageReference>
<PackageReference Include="MSTest.TestAdapter">
<Version>1.2.0</Version>
Expand Down
8 changes: 4 additions & 4 deletions glTF-Toolkit.UWP/glTF-Toolkit.UWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,15 +284,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets" Condition="Exists('..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" />
<Import Project="..\packages\directxtex_uwp.2017.12.13.1\build\native\directxtex_uwp.targets" Condition="Exists('..\packages\directxtex_uwp.2017.12.13.1\build\native\directxtex_uwp.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" />
<Import Project="..\packages\directxtex_uwp.2018.2.9.1\build\native\directxtex_uwp.targets" Condition="Exists('..\packages\directxtex_uwp.2018.2.9.1\build\native\directxtex_uwp.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" />
</ImportGroup>
<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\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_uwp.2017.12.13.1\build\native\directxtex_uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_uwp.2017.12.13.1\build\native\directxtex_uwp.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_uwp.2018.2.9.1\build\native\directxtex_uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_uwp.2018.2.9.1\build\native\directxtex_uwp.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions glTF-Toolkit.UWP/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxtex_uwp" version="2017.12.13.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.26.0" targetFramework="native" />
<package id="directxtex_uwp" version="2018.2.9.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.46.0" targetFramework="native" />
<package id="rapidjson.temprelease" version="0.0.2.20" targetFramework="native" />
</packages>
8 changes: 4 additions & 4 deletions glTF-Toolkit/glTF-Toolkit.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,15 +330,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets" Condition="Exists('..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" />
<Import Project="..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets" Condition="Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" />
<Import Project="..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets" Condition="Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" />
</ImportGroup>
<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\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\rapidjson.temprelease.0.0.2.20\build\native\rapidjson.temprelease.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2017.12.13.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.26.0\build\native\Microsoft.glTF.CPP.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2015.2018.2.9.1\build\native\directxtex_desktop_2015.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.glTF.CPP.1.3.46.0\build\native\Microsoft.glTF.CPP.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions glTF-Toolkit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxtex_desktop_2015" version="2017.12.13.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.26.0" targetFramework="native" />
<package id="directxtex_desktop_2015" version="2018.2.9.1" targetFramework="native" />
<package id="Microsoft.glTF.CPP" version="1.3.46.0" targetFramework="native" />
<package id="rapidjson.temprelease" version="0.0.2.20" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion glTF-Toolkit/src/SerializeBinary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace
max = minmax.second;
}

builder.AddAccessor(accessorContents, accessor.componentType, accessor.type, min, max);
builder.AddAccessor(accessorContents, AccessorDesc(accessor.type, accessor.componentType, accessor.normalized, min, max));
}

template <typename OriginalType, typename NewType>
Expand Down