Skip to content

Commit

Permalink
Revert "[Editor] Remove some windows dependencies in editor libraries (…
Browse files Browse the repository at this point in the history 
…stride3d#1908)"

This reverts commit 329becb.
  • Loading branch information
@Eideren
Eideren committed Oct 22, 2023
1 parent 1db0c46 commit 25a0912
Show file tree
Hide file tree
Showing 25 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion samples/Tests/Stride.Samples.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\sources\shared\Stride.NuGetResolver\Stride.NuGetResolver.projitems" Label="Shared" />
<Import Project="..\..\sources\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/assets/Stride.Core.Assets.Quantum.Tests/Stride.Core.Assets.Quantum.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
<RestorePackages>true</RestorePackages>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="17.0.0" ExcludeAssets="runtime" />
Expand Down
2 changes: 1 addition & 1 deletion sources/assets/Stride.Core.Assets.Tests/Stride.Core.Assets.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StridePackAssets>true</StridePackAssets>
<StrideLocalized>true</StrideLocalized>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization --parameter-key</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.Core.Assets.Editor.Tests/Stride.Core.Assets.Editor.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\targets\Stride.Core.props" />
<PropertyGroup>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
<StrideLocalized>true</StrideLocalized>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.Editor/Stride.Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideLocalized>true</StrideLocalized>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.GameStudio.Tests/Stride.GameStudio.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
Expand Down
2 changes: 1 addition & 1 deletion ...ces/presentation/Stride.Core.Presentation.Dialogs/Stride.Core.Presentation.Dialogs.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion sources/presentation/Stride.Core.Presentation.Graph/Stride.Core.Presentation.Graph.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ParadoxBuildTags>WindowsTools</ParadoxBuildTags>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
<RestorePackages>true</RestorePackages>
Expand Down
2 changes: 1 addition & 1 deletion ...tion/Stride.Core.Presentation.Quantum.Tests/Stride.Core.Presentation.Quantum.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion ...ces/presentation/Stride.Core.Presentation.Quantum/Stride.Core.Presentation.Quantum.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<UseWPF>true</UseWPF>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sources/presentation/Stride.Core.Presentation.Tests/Stride.Core.Presentation.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion sources/presentation/Stride.Core.Presentation/Stride.Core.Presentation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
<StrideLocalized>true</StrideLocalized>
Expand Down
2 changes: 1 addition & 1 deletion sources/presentation/Stride.Core.Quantum.Tests/Stride.Core.Quantum.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Import Project="..\..\targets\Stride.UnitTests.props" />
<PropertyGroup>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
Expand Down
2 changes: 1 addition & 1 deletion ...entation/Stride.Core.Translation.Presentation/Stride.Core.Translation.Presentation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
Expand Down
3 changes: 1 addition & 2 deletions sources/targets/Stride.Core.TargetFrameworks.Editor.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<StrideEditorTargetFramework>net6.0</StrideEditorTargetFramework>
<StrideEditorAppTargetFramework>net6.0-windows7.0</StrideEditorAppTargetFramework>
<StrideEditorTargetFramework>net6.0-windows7.0</StrideEditorTargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>WinExe</OutputType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}</ProjectGuid>
<OutputType>Exe</OutputType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
<StrideAssemblyProcessorOptions>--auto-module-initializer --serialization</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.EffectCompilerServer/Stride.EffectCompilerServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Exe</OutputType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.Importer.FBX/Stride.Importer.FBX.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\targets\Stride.props" />
<PropertyGroup>
<StrideProjectType>Cpp</StrideProjectType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessorOptions>
</StrideAssemblyProcessorOptions>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.SamplesTestServer/Stride.SamplesTestServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\targets\Stride.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideAssemblyProcessor>true</StrideAssemblyProcessor>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sources/tools/Stride.TestRunner/Stride.TestRunner.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\targets\Stride.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>$(StrideEditorAppTargetFramework)</TargetFramework>
<TargetFramework>$(StrideEditorTargetFramework)</TargetFramework>
<StrideBuildTags>WindowsTools</StrideBuildTags>
<StrideCompilerTargetsEnable Condition="'$(StridePackageBuild)' == 'true'">false</StrideCompilerTargetsEnable>
<StrideCompilerTargetsEnable Condition="'$(StrideSkipUnitTests)' == 'true'">false</StrideCompilerTargetsEnable>
Expand Down

0 comments on commit 25a0912

Please sign in to comment.