diff --git a/build/Stride.sln b/build/Stride.sln
index 99b5be661..71b8c5d25 100644
--- a/build/Stride.sln
+++ b/build/Stride.sln
@@ -308,8 +308,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Voxels", "..\sources
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xunit.runner.stride", "..\sources\tests\xunit.runner.stride\xunit.runner.stride.csproj", "{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.NuGetLoader", "..\sources\tools\Stride.NuGetLoader\Stride.NuGetLoader.csproj", "{7FA381C8-8EBE-4515-969D-01369CC47D0E}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Engine.NoAssets.Tests.Windows", "..\sources\engine\Stride.Engine.NoAssets.Tests\Stride.Engine.NoAssets.Tests.Windows.csproj", "{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.Importer.Assimp", "..\sources\tools\Stride.Importer.Assimp\Stride.Importer.Assimp.csproj", "{967BA05D-4AC4-4848-AEFD-894EF2309E4D}"
@@ -326,6 +324,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Command
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stride.VisualStudio.Commands", "..\sources\tools\Stride.VisualStudio.Commands\Stride.VisualStudio.Commands.csproj", "{A7FC60AE-BB54-47D3-8787-788EEC65AD45}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stride.NuGetResolver.UI", "..\sources\shared\Stride.NuGetResolver.UI\Stride.NuGetResolver.UI.csproj", "{79F7B3CE-A22F-426D-8DAB-2F692F167210}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -1365,18 +1365,6 @@ Global
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Win32.ActiveCfg = Release|Any CPU
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392}.Release|Win32.Build.0 = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Debug|Win32.Build.0 = Debug|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Any CPU.Build.0 = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Win32.ActiveCfg = Release|Any CPU
- {7FA381C8-8EBE-4515-969D-01369CC47D0E}.Release|Win32.Build.0 = Release|Any CPU
{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C94168A-3C0D-4C6B-883B-91627D2EF3A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1461,6 +1449,18 @@ Global
{A7FC60AE-BB54-47D3-8787-788EEC65AD45}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A7FC60AE-BB54-47D3-8787-788EEC65AD45}.Release|Win32.ActiveCfg = Release|Any CPU
{A7FC60AE-BB54-47D3-8787-788EEC65AD45}.Release|Win32.Build.0 = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Debug|Win32.Build.0 = Debug|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Any CPU.Build.0 = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Win32.ActiveCfg = Release|Any CPU
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210}.Release|Win32.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1575,7 +1575,6 @@ Global
{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209}
{66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209}
{D5B023BE-010F-44A8-ABF1-DB6F3BCEA392} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
- {7FA381C8-8EBE-4515-969D-01369CC47D0E} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
{1C94168A-3C0D-4C6B-883B-91627D2EF3A1} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
{967BA05D-4AC4-4848-AEFD-894EF2309E4D} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
{806AA078-6070-4BB6-B05B-6EE6B21B1CDE} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
@@ -1584,6 +1583,7 @@ Global
{DF9172C0-DEA3-4DCE-8AF1-39439ACB4BCD} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
{09E29A89-A6D7-45C9-B7BA-CA6D643C246F} = {DF9172C0-DEA3-4DCE-8AF1-39439ACB4BCD}
{A7FC60AE-BB54-47D3-8787-788EEC65AD45} = {DF9172C0-DEA3-4DCE-8AF1-39439ACB4BCD}
+ {79F7B3CE-A22F-426D-8DAB-2F692F167210} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
diff --git a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
index 5bb429027..afd5598b8 100644
--- a/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
+++ b/sources/editor/Stride.GameStudio/Stride.GameStudio.csproj
@@ -15,7 +15,7 @@
true
--auto-module-initializer
true
- true
+ true
true
true
false
@@ -107,11 +107,9 @@
_StrideIncludeExtraAssemblies;$(TargetsForTfmSpecificBuildOutput)
-
-
diff --git a/sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml b/sources/shared/Stride.NuGetResolver.UI/SplashScreenWindow.xaml
similarity index 100%
rename from sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml
rename to sources/shared/Stride.NuGetResolver.UI/SplashScreenWindow.xaml
diff --git a/sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml.cs b/sources/shared/Stride.NuGetResolver.UI/SplashScreenWindow.xaml.cs
similarity index 100%
rename from sources/shared/Stride.NuGetResolver/SplashScreenWindow.xaml.cs
rename to sources/shared/Stride.NuGetResolver.UI/SplashScreenWindow.xaml.cs
diff --git a/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj
new file mode 100644
index 000000000..68ae49ba6
--- /dev/null
+++ b/sources/shared/Stride.NuGetResolver.UI/Stride.NuGetResolver.UI.csproj
@@ -0,0 +1,15 @@
+
+
+
+ net8.0-windows
+ enable
+ true
+ enable
+ WindowsTools
+
+
+
+
+
+
+
diff --git a/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs b/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs
index db4991920..8fdcd8564 100644
--- a/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs
+++ b/sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs
@@ -77,7 +77,7 @@ namespace Stride.Core.Assets
var logger = new Logger();
-#if STRIDE_NUGET_RESOLVER_UX
+#if STRIDE_NUGET_RESOLVER_UI
var dialogNotNeeded = new TaskCompletionSource();
var dialogClosed = new TaskCompletionSource();
@@ -160,7 +160,7 @@ namespace Stride.Core.Assets
}
catch (Exception e)
{
-#if STRIDE_NUGET_RESOLVER_UX
+#if STRIDE_NUGET_RESOLVER_UI
logger.LogError($@"Error restoring NuGet packages: {e}");
dialogClosed.Task.Wait();
#else
@@ -181,7 +181,7 @@ namespace Stride.Core.Assets
}
finally
{
-#if STRIDE_NUGET_RESOLVER_UX
+#if STRIDE_NUGET_RESOLVER_UI
dialogNotNeeded.TrySetResult(true);
#endif
SynchronizationContext.SetSynchronizationContext(previousSynchronizationContext);
diff --git a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems
index f126c4544..8e20d9afd 100644
--- a/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems
+++ b/sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems
@@ -12,36 +12,28 @@
-
- SplashScreenWindow.xaml
-
-
-
-
- Designer
- MSBuild:Compile
-
+
- $(AllowedOutputExtensionsInPackageBuildOutputFolder);.config;.loaderdata
- true
- STRIDE_NUGET_RESOLVER_UX;$(DefineConstants)
+ _StrideIncludeNuGetResolverDependencies;$(TargetsForTfmSpecificBuildOutput)
+ _StrideIncludeNuGetResolverUI;$(TargetsForTfmSpecificBuildOutput)
+ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.config;.exe
+ true
+ STRIDE_NUGET_RESOLVER_UI;$(DefineConstants)
-
-
- <_StrideNuGetLoaderWindowsDesktop Condition="'$(_MicrosoftNetSdkWindowsDesktop)' == 'true'">true
- <_StrideNuGetLoaderApplicationIcon Condition="'$(ApplicationIcon)' != ''">$(MSBuildProjectDirectory)\$(ApplicationIcon)
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj b/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj
index 45a519fbb..4bf352f2b 100644
--- a/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj
+++ b/sources/tools/Stride.ConnectionRouter/Stride.ConnectionRouter.csproj
@@ -8,7 +8,7 @@
WindowsTools
true
--auto-module-initializer
- true
+ true
true
diff --git a/sources/tools/Stride.NuGetLoader/Program.cs b/sources/tools/Stride.NuGetLoader/Program.cs
deleted file mode 100644
index 6b4f60055..000000000
--- a/sources/tools/Stride.NuGetLoader/Program.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Stride.Core.Assets;
-
-namespace Stride.NuGetLoader
-{
- class Program
- {
-#if STRIDE_STA_THREAD_ATTRIBUTE_ON_MAIN
- [STAThread]
-#endif
- static void Main(string[] args)
- {
- // Get loader data (text file, format is "PackageName/PackageId")
- var loaderDataFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Stride.NuGetLoader.loaderdata");
- var loaderData = File.ReadLines(loaderDataFile).First().Split('/');
-
- var packageName = loaderData[0];
- var packageVersion = loaderData[1];
-
- NuGetAssemblyResolver.SetupNuGet(packageName, packageVersion);
- AppDomain.CurrentDomain.ExecuteAssemblyByName(packageName, args);
- }
- }
-}
diff --git a/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj b/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
deleted file mode 100644
index 6bd3ab865..000000000
--- a/sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- Exe
- net8.0-windows7.0
- true
- true
- obj\$(Configuration)\$(StrideApplicationName)
- bin\$(Configuration)\$(StrideApplicationName)
- STRIDE_NUGET_RESOLVER_UX;$(DefineConstants)
-
- false
- false
- false
- STRIDE_STA_THREAD_ATTRIBUTE_ON_MAIN;$(DefineConstants)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MSBuild:Compile
-
-
-
-
-