[Build] Target net6.0-windows7.0 temporarily and use official packages

Some Stride packages still depend on Windows (see stride3d#1908). Some Stride packages are not built properly locally.
Color-Rise · Oct 15, 2023 · fa5ca3a · fa5ca3a
1 parent b3d4989
commit fa5ca3a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 26 deletions.
diff --git a/sources/xplat-editor/Directory.Build.props b/sources/xplat-editor/Directory.Build.props
@@ -1,6 +1,11 @@
 <Project>
   <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.4</AvaloniaVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AvaloniaVersion>11.0.4</AvaloniaVersion> 
+    <TargetFramework>net6.0-windows7.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/...xplat-editor/Stride.Avalonia.Core.Assets.Editor/Stride.Avalonia.Core.Assets.Editor.csproj b/...xplat-editor/Stride.Avalonia.Core.Assets.Editor/Stride.Avalonia.Core.Assets.Editor.csproj
@@ -1,13 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Stride.Core.Assets.Quantum" Version="4.1.0.1" />
+    <PackageReference Include="Stride.Core.Assets.Quantum" Version="4.1.0.1948" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...s/xplat-editor/Stride.Avalonia.Core.Presentation/Stride.Avalonia.Core.Presentation.csproj b/...s/xplat-editor/Stride.Avalonia.Core.Presentation/Stride.Avalonia.Core.Presentation.csproj
@@ -1,15 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-    <PackageReference Include="Stride.Core.Design" Version="4.1.0.1" />
+    <PackageReference Include="Stride.Core.Design" Version="4.1.0.1948" />
 
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />

diff --git a/...xplat-editor/Stride.Avalonia.GameStudio.Desktop/Stride.Avalonia.GameStudio.Desktop.csproj b/...xplat-editor/Stride.Avalonia.GameStudio.Desktop/Stride.Avalonia.GameStudio.Desktop.csproj
@@ -2,11 +2,6 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <OutputType Condition="'$(Configuration)' == 'Debug'">Exe</OutputType>
-    <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
-    One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>

diff --git a/sources/xplat-editor/Stride.Avalonia.GameStudio/Stride.Avalonia.GameStudio.csproj b/sources/xplat-editor/Stride.Avalonia.GameStudio/Stride.Avalonia.GameStudio.csproj
@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
+
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>