mirror of
https://github.com/bloxstraplabs/bloxstrap.git
synced 2025-04-21 10:01:27 -07:00
fix: publishing in VS (cherrypicked from 2.6.0)
This commit is contained in:
parent
880c076fcd
commit
48db881ceb
@ -2,8 +2,10 @@
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
using Windows.Win32;
|
using Windows.Win32;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Bloxstrap
|
namespace Bloxstrap
|
||||||
{
|
{
|
||||||
@ -198,7 +200,9 @@ namespace Bloxstrap
|
|||||||
{
|
{
|
||||||
var handle = menuProcess.MainWindowHandle;
|
var handle = menuProcess.MainWindowHandle;
|
||||||
Logger.WriteLine(LOG_IDENT, $"Found an already existing menu window with handle {handle}");
|
Logger.WriteLine(LOG_IDENT, $"Found an already existing menu window with handle {handle}");
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
PInvoke.SetForegroundWindow((HWND)handle);
|
PInvoke.SetForegroundWindow((HWND)handle);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
<Version>2.5.4</Version>
|
<Version>2.5.4</Version>
|
||||||
<FileVersion>2.5.4.0</FileVersion>
|
<FileVersion>2.5.4.0</FileVersion>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -40,11 +41,10 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
|
||||||
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
|
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
|
||||||
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.18-beta">
|
<PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
|
||||||
<!--<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>-->
|
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="securifybv.ShellLink" Version="0.1.0" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -60,4 +60,25 @@
|
|||||||
</AssemblyAttribute>
|
</AssemblyAttribute>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<AdditionalFiles Include="NativeMethods.txt" />
|
||||||
|
|
||||||
|
<!-- Provide the path to the winmds used as input into the analyzer. -->
|
||||||
|
<CompilerVisibleProperty Include="CsWin32InputMetadataPaths" />
|
||||||
|
<CompilerVisibleProperty Include="CsWin32InputDocPaths" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="AssembleCsWin32InputPaths" BeforeTargets="GenerateMSBuildEditorConfigFileCore">
|
||||||
|
<!-- Roslyn only allows source generators to see msbuild properties, to lift msbuild items into semicolon-delimited properties. -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<CsWin32InputMetadataPaths>@(ProjectionMetadataWinmd->'%(FullPath)','|')</CsWin32InputMetadataPaths>
|
||||||
|
<CsWin32InputDocPaths>@(ProjectionDocs->'%(FullPath)','|')</CsWin32InputDocPaths>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="FixMds" BeforeTargets="CoreCompile" Condition="'@(ProjectionMetadataWinmd)'==''">
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectionMetadataWinmd Include="$(UserProfile)\.nuget\packages\microsoft.windows.sdk.win32metadata\55.0.45-preview\Windows.Win32.winmd" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -6,9 +6,11 @@ using Wpf.Ui.Appearance;
|
|||||||
using Wpf.Ui.Mvvm.Contracts;
|
using Wpf.Ui.Mvvm.Contracts;
|
||||||
using Wpf.Ui.Mvvm.Services;
|
using Wpf.Ui.Mvvm.Services;
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
using Windows.Win32;
|
using Windows.Win32;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
using Windows.Win32.UI.WindowsAndMessaging;
|
using Windows.Win32.UI.WindowsAndMessaging;
|
||||||
|
#endif
|
||||||
|
|
||||||
using Bloxstrap.Integrations;
|
using Bloxstrap.Integrations;
|
||||||
|
|
||||||
@ -90,11 +92,13 @@ namespace Bloxstrap.UI.Elements.ContextMenu
|
|||||||
// this is done to register the context menu wrapper as a tool window so it doesnt appear in the alt+tab switcher
|
// this is done to register the context menu wrapper as a tool window so it doesnt appear in the alt+tab switcher
|
||||||
// https://stackoverflow.com/a/551847/11852173
|
// https://stackoverflow.com/a/551847/11852173
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
HWND hWnd = (HWND)new WindowInteropHelper(this).Handle;
|
HWND hWnd = (HWND)new WindowInteropHelper(this).Handle;
|
||||||
|
|
||||||
int exStyle = PInvoke.GetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
|
int exStyle = PInvoke.GetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
|
||||||
exStyle |= 0x00000080; //NativeMethods.WS_EX_TOOLWINDOW;
|
exStyle |= 0x00000080; //NativeMethods.WS_EX_TOOLWINDOW;
|
||||||
PInvoke.SetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, exStyle);
|
PInvoke.SetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, exStyle);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Window_Closed(object sender, EventArgs e) => App.Logger.WriteLine("MenuContainer::Window_Closed", "Context menu container closed");
|
private void Window_Closed(object sender, EventArgs e) => App.Logger.WriteLine("MenuContainer::Window_Closed", "Context menu container closed");
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
using System.Media;
|
using System.Media;
|
||||||
using System.Windows.Interop;
|
using System.Windows.Interop;
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
using Windows.Win32;
|
using Windows.Win32;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Bloxstrap.UI.Elements.Dialogs
|
namespace Bloxstrap.UI.Elements.Dialogs
|
||||||
{
|
{
|
||||||
@ -33,7 +35,9 @@ namespace Bloxstrap.UI.Elements.Dialogs
|
|||||||
Loaded += delegate
|
Loaded += delegate
|
||||||
{
|
{
|
||||||
var hWnd = new WindowInteropHelper(this).Handle;
|
var hWnd = new WindowInteropHelper(this).Handle;
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
PInvoke.FlashWindow((HWND)hWnd, true);
|
PInvoke.FlashWindow((HWND)hWnd, true);
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,8 +2,10 @@
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Interop;
|
using System.Windows.Interop;
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
using Windows.Win32;
|
using Windows.Win32;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Bloxstrap.UI.Elements.Dialogs
|
namespace Bloxstrap.UI.Elements.Dialogs
|
||||||
{
|
{
|
||||||
@ -61,7 +63,9 @@ namespace Bloxstrap.UI.Elements.Dialogs
|
|||||||
Loaded += delegate
|
Loaded += delegate
|
||||||
{
|
{
|
||||||
IntPtr hWnd = new WindowInteropHelper(this).Handle;
|
IntPtr hWnd = new WindowInteropHelper(this).Handle;
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
PInvoke.FlashWindow((HWND)hWnd, true);
|
PInvoke.FlashWindow((HWND)hWnd, true);
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,8 +4,10 @@ using System.Windows.Controls;
|
|||||||
using System.Windows.Interop;
|
using System.Windows.Interop;
|
||||||
using System.Windows.Media.Imaging;
|
using System.Windows.Media.Imaging;
|
||||||
|
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
using Windows.Win32;
|
using Windows.Win32;
|
||||||
using Windows.Win32.Foundation;
|
using Windows.Win32.Foundation;
|
||||||
|
#endif
|
||||||
|
|
||||||
using Bloxstrap.UI.Utility;
|
using Bloxstrap.UI.Utility;
|
||||||
|
|
||||||
@ -111,7 +113,9 @@ namespace Bloxstrap.UI.Elements.Dialogs
|
|||||||
Loaded += delegate
|
Loaded += delegate
|
||||||
{
|
{
|
||||||
var hWnd = new WindowInteropHelper(this).Handle;
|
var hWnd = new WindowInteropHelper(this).Handle;
|
||||||
|
#if !DEBUG_ROSLYN_PUBLISH
|
||||||
PInvoke.FlashWindow((HWND)hWnd, true);
|
PInvoke.FlashWindow((HWND)hWnd, true);
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user