Skip to content

Commit

Permalink
[Editor] Bump various libraries to .NET Standard/Core versions
Browse files Browse the repository at this point in the history
  • Loading branch information
xen2 committed May 10, 2020
1 parent 8332fd3 commit ed09ac0
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 94 deletions.
3 changes: 0 additions & 3 deletions deps/CppNet/CoreCLR/CppNet.dll

This file was deleted.

3 changes: 0 additions & 3 deletions deps/CppNet/CppNet.dll

This file was deleted.

3 changes: 0 additions & 3 deletions deps/CppNet/Store/CppNet.dll

This file was deleted.

27 changes: 5 additions & 22 deletions deps/CppNet/build.bat
Original file line number Diff line number Diff line change
@@ -1,37 +1,20 @@
@echo off
setlocal
set CPPNET=%~dp0..\..\externals\CppNet
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86

pushd %CPPNET%

rem Build Non-portable version
msbuild /nologo /p:Configuration=Release CppNet.sln
msbuild /nologo /p:Configuration=Release;Platform="Any CPU" CppNet.sln
if ERRORLEVEL 1 echo "Cannot build CppNet" && pause

rem Build CoreCLR version
msbuild /nologo /p:Configuration=ReleaseCoreCLR CppNet.sln
if ERRORLEVEL 1 echo "Cannot build CppNet for CoreCLR" && pause

rem Build Store version
msbuild /nologo /p:Configuration=Release CppNet_Store.sln
if ERRORLEVEL 1 echo "Cannot build CppNet for Store" && pause

popd

xcopy /Y /Q %CPPNET%\Bin\Release\CppNet.dll . > nul
mkdir netstandard1.3
xcopy /Y /Q %CPPNET%\Bin\Release\CppNet.dll netstandard1.3 > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.dll" && pause
xcopy /Y /Q %CPPNET%\Bin\Release\CppNet.pdb . > nul
xcopy /Y /Q %CPPNET%\Bin\Release\CppNet.pdb netstandard1.3 > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.pdb" && pause

xcopy /Y /Q %CPPNET%\Bin\CoreCLR\Release\CppNet.dll CoreCLR\ > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.dll to CoreCLR" && pause
xcopy /Y /Q %CPPNET%\Bin\CoreCLR\Release\CppNet.pdb CoreCLR\ > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.pdb to CoreCLR" && pause

xcopy /Y /Q %CPPNET%\Bin\Store\Release\CppNet.dll Store\ > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.dll to Store" && pause
xcopy /Y /Q %CPPNET%\Bin\Store\Release\CppNet.pdb Store\ > nul
if ERRORLEVEL 1 echo "Cannot copy CppNet.pdb to Store" && pause

echo CppNet build completed successfully
3 changes: 3 additions & 0 deletions deps/CppNet/netstandard1.3/CppNet.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions deps/CppNet/netstandard1.3/CppNet.pdb
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/Gettext.Net/GNU.Getopt.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/Gettext.Net/GNU.Gettext.Msgfmt.exe
Git LFS file not shown
6 changes: 6 additions & 0 deletions deps/Gettext.Net/GNU.Gettext.Msgfmt.exe.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
4 changes: 2 additions & 2 deletions deps/Gettext.Net/GNU.Gettext.dll
Git LFS file not shown
Git LFS file not shown
3 changes: 3 additions & 0 deletions deps/Gettext.Net/System.Security.AccessControl.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions deps/Gettext.Net/System.Security.Permissions.dll
Git LFS file not shown
3 changes: 3 additions & 0 deletions deps/Gettext.Net/System.Security.Principal.Windows.dll
Git LFS file not shown
4 changes: 2 additions & 2 deletions deps/VHACD/VHACDSharp.dll
Git LFS file not shown
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup>
<Reference Include="GNU.Gettext, Version=1.1.6354.32453, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\Gettext.Net\GNU.Gettext.dll</HintPath>
</Reference>
<PackageReference Include="Stride.GNU.Gettext" Version="1.0.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<RestorePackages>true</RestorePackages>
<UseWPF>true</UseWPF>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
<StrideRoslynPadTargetFramework Condition="$(TargetFramework.StartsWith('net4'))">net462</StrideRoslynPadTargetFramework>
<StrideRoslynPadTargetFramework Condition="$(TargetFramework.StartsWith('netcoreapp'))">netcoreapp3.1</StrideRoslynPadTargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
Expand All @@ -22,13 +24,13 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
<Reference Include="RoslynPad.Editor.Windows">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\net462\RoslynPad.Editor.Windows.dll</HintPath>
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\$(StrideRoslynPadTargetFramework)\RoslynPad.Editor.Windows.dll</HintPath>
</Reference>
<Reference Include="RoslynPad.Roslyn.Windows">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\net462\RoslynPad.Roslyn.Windows.dll</HintPath>
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\$(StrideRoslynPadTargetFramework)\RoslynPad.Roslyn.Windows.dll</HintPath>
</Reference>
<Reference Include="RoslynPad.Roslyn">
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\net462\RoslynPad.Roslyn.dll</HintPath>
<HintPath>$(StrideCommonDependenciesDir)RoslynPad\$(StrideRoslynPadTargetFramework)\RoslynPad.Roslyn.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Windows.Forms" />
Expand Down
4 changes: 0 additions & 4 deletions sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
<PackageReference Include="Stride.Metrics" Version="1.0.3" />
<PackageReference Include="Stride.CrashReport" Version="1.0.2" />
<PackageReference Include="Mono.Cecil" Version="0.10.4" />
<Reference Include="Renci.SshNet, Version=2016.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\SSH.NET\Renci.SshNet.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Stride.Core.AssemblyProcessor">
<HintPath>..\..\..\deps\AssemblyProcessor\Stride.Core.AssemblyProcessor.exe</HintPath>
Expand Down
5 changes: 1 addition & 4 deletions sources/engine/Stride.Assets/Stride.Assets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
<PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.4.0" />
<Reference Include="Renci.SshNet">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\SSH.NET\Renci.SshNet.dll</HintPath>
</Reference>
<PackageReference Include="SSH.NET" Version="2016.1.0" />
<PackageReference Include="System.AppContext" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Console" Version="4.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.WindowsAPICodePack">
<HintPath>..\..\..\deps\WindowsAPICodePack\Microsoft.WindowsAPICodePack.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAPICodePack.Shell">
<HintPath>..\..\..\deps\WindowsAPICodePack\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
Expand Down
30 changes: 3 additions & 27 deletions sources/shaders/Stride.Core.Shaders/Stride.Core.Shaders.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,6 @@
<StrideAssemblyProcessorOptions>--serialization</StrideAssemblyProcessorOptions>
<StrideBuildTags>*</StrideBuildTags>
</PropertyGroup>
<Choose>
<When Condition="('$(StridePlatform)' == 'UWP')">
<ItemGroup>
<Reference Include="CppNet">
<HintPath>..\..\..\deps\CppNet\Store\CppNet.dll</HintPath>
</Reference>
</ItemGroup>
</When>
<When Condition="'$(StrideNETRuntime)' != ''">
<ItemGroup>
<Reference Include="CppNet">
<HintPath>..\..\..\deps\CppNet\$(StrideNETRuntime)\CppNet.dll</HintPath>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="CppNet">
<HintPath>..\..\..\deps\CppNet\CppNet.dll</HintPath>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
<Choose>
<When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
</When>
</Choose>
<ItemGroup>
<Compile Include="..\..\shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
Expand Down Expand Up @@ -69,6 +42,9 @@
<None Include="Analysis\Hlsl\HlslDeclarations.h" />
</ItemGroup>
<ItemGroup>
<Reference Include="CppNet">
<HintPath>..\..\..\deps\CppNet\netstandard1.3\CppNet.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\core\Stride.Core\Stride.Core.csproj" />
<ProjectReference Include="..\Irony\Irony.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,8 @@
</When>
</Choose>
<ItemGroup>
<Reference Include="GNU.Getopt">
<HintPath>..\..\..\deps\Gettext.Net\GNU.Getopt.dll</HintPath>
</Reference>
<Reference Include="GNU.Gettext, Version=1.1.5392.32120, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\Gettext.Net\GNU.Gettext.dll</HintPath>
</Reference>
<PackageReference Include="Stride.GNU.Getopt" Version="1.0.0.0" />
<PackageReference Include="Stride.GNU.Gettext" Version="1.0.0.0" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
Expand Down

0 comments on commit ed09ac0

Please sign in to comment.