Skip to content
Permalink
Browse files

[Build] Use netstandard2.0 version of OpenTK

  • Loading branch information
xen2 committed Dec 20, 2018
1 parent 6ac74bb commit 363f0aaf3e33737ffabc30e9a94179b7e7a2299f
@@ -1 +1,2 @@
*.pdb
*.pdb
*.nupkg
Git LFS file not shown
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Xenko.OpenTK</id>
<version>1.0.1</version>
<version>1.0.2</version>
<authors>Xenko contributors and OpenTK team</authors>
<owners>Xenko contributors and OpenTK team</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -11,7 +11,7 @@

<files>
<file src="OpenTK.dll" target="ref\net45" />
<file src="OpenTK.dll" target="runtimes\win7\lib\net45" />
<file src="OpenTK.dll" target="runtimes\win\lib\net45" />
<file src="Linux\OpenTK.dll" target="lib\netstandard2.0" />
<file src="Android\OpenTK-1.1.dll" target="lib\monoandroid50" />
<file src="iOS\OpenTK-1.1.dll" target="lib\xamarinios10" />
@@ -1,18 +1,19 @@
@echo off

rem If not already loaded, setup VisualStudio
if "%VisualStudioVersion%" EQ "" call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86

set opentk=..\..\externals\opentk

pushd %opentk%
..\..\build\.nuget\NuGet.exe restore OpenTK.sln
..\..\build\.nuget\NuGet.exe restore source\OpenTK\OpenTK.NETStandard.csproj
popd

REM Windows
msbuild %opentk%\OpenTK.sln /Property:Configuration=Release;Platform="Any CPU"
copy /Y %opentk%\Binaries\OpenTK\Release\OpenTK.dll .
copy /Y %opentk%\Binaries\OpenTK\Release\OpenTK.pdb .
REM NET Standard
msbuild %opentk%\source\OpenTK\OpenTK.NETStandard.csproj /Property:Configuration=Release;Platform="AnyCPU"
copy /Y %opentk%\Binaries\OpenTK\Release\netstandard2.0\OpenTK.dll .
copy /Y %opentk%\Binaries\OpenTK\Release\netstandard2.0\OpenTK.pdb .

REM Android
msbuild %opentk%\OpenTK.Android.sln /Property:Configuration=Release;Platform="Any CPU"
@@ -25,29 +26,3 @@ msbuild %opentk%\OpenTK.iOS.sln /Property:Configuration=Release;Platform="Any CP
if not exist iOS mkdir iOS
copy /Y %opentk%\Binaries\iOS\Release\OpenTK-1.1.dll iOS
copy /Y %opentk%\Binaries\iOS\Release\OpenTK-1.1.dll.mdb iOS

if not exist CoreCLR mkdir CoreCLR
msbuild %opentk%\source\OpenTK\OpenTK.csproj /Property:Configuration=ReleaseCoreCLR;Platform=AnyCPU
mkdir CoreCLR\Windows
copy /Y %opentk%\Binaries\OpenTK\ReleaseCoreCLR\OpenTK.dll CoreCLR\Windows
copy /Y %opentk%\Binaries\OpenTK\ReleaseCoreCLR\OpenTK.pdb CoreCLR\Windows

msbuild %opentk%\source\OpenTK\OpenTK.csproj /Property:Configuration=ReleaseCoreCLR;Platform=Linux
if not exist CoreCLR\Linux mkdir CoreCLR\Linux
copy /Y %opentk%\Binaries\OpenTK\Linux\ReleaseCoreCLR\OpenTK.dll CoreCLR\Linux
copy /Y %opentk%\Binaries\OpenTK\Linux\ReleaseCoreCLR\OpenTK.pdb CoreCLR\Linux

msbuild %opentk%\source\OpenTK\OpenTK.csproj /Property:Configuration=ReleaseMinimal;Platform=Linux
if not exist Linux mkdir Linux
copy /Y %opentk%\Binaries\OpenTK\Linux\ReleaseMinimal\OpenTK.dll Linux
copy /Y %opentk%\Binaries\OpenTK\Linux\ReleaseMinimal\OpenTK.pdb Linux

msbuild %opentk%\source\OpenTK\OpenTK.csproj /Property:Configuration=ReleaseCoreCLR;Platform=macOS
if not exist CoreCLR\macOS mkdir CoreCLR\macOS
copy /Y %opentk%\Binaries\OpenTK\macOS\ReleaseCoreCLR\OpenTK.dll CoreCLR\macOS
copy /Y %opentk%\Binaries\OpenTK\macOS\ReleaseCoreCLR\OpenTK.pdb CoreCLR\macOS

msbuild %opentk%\source\OpenTK\OpenTK.csproj /Property:Configuration=ReleaseMinimal;Platform=macOS
if not exist macOS mkdir macOS
copy /Y %opentk%\Binaries\OpenTK\macOS\ReleaseMinimal\OpenTK.dll macOS
copy /Y %opentk%\Binaries\OpenTK\macOS\ReleaseMinimal\OpenTK.pdb macOS
@@ -195,7 +195,7 @@
<PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(TargetFramework)' == 'net45' Or $(TargetFramework.StartsWith('uap10.0'))" />
<PackageReference Include="SharpDX.Direct3D12" Version="4.0.1" Condition="'$(TargetFramework)' == 'net45'" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" Condition="'$(TargetFramework)' == 'net45' Or $(TargetFramework.StartsWith('uap10.0'))" />
<PackageReference Include="Xenko.OpenTK" Version="1.0.1" Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'xamarinios10' Or '$(TargetFramework)' == 'monoandroid50' Or '$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="Xenko.OpenTK" Version="1.0.2" Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'xamarinios10' Or '$(TargetFramework)' == 'monoandroid50' Or '$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />

0 comments on commit 363f0aa

Please sign in to comment.
You can’t perform that action at this time.