Skip to content

Commit 3b0b2fb

Browse files
null511null511
committed
fix norender release
1 parent 1daf4d0 commit 3b0b2fb

File tree

8 files changed

+24
-39
lines changed

8 files changed

+24
-39
lines changed

‎.github/workflows/Release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
submodules: recursive
3838
- name: Publish CLI Binaries
3939
run: |
40-
dotnet publish PixelGraph.CLI -c Release -r win-x64 -o ../publish/win-cli-x64 -p:PublishSingleFile=true --self-contained false
41-
dotnet publish PixelGraph.CLI -c Release -r linux-x64 -o ../publish/linux-cli-x64 -p:PublishSingleFile=true --self-contained false
42-
dotnet publish PixelGraph.CLI -c Release -r osx-x64 -o ../publish/osx-cli-x64 -p:PublishSingleFile=true --self-contained false
40+
dotnet publish PixelGraph.CLI -c Release -r win-x64 -o publish/win-cli-x64 -p:PublishSingleFile=true --self-contained false
41+
dotnet publish PixelGraph.CLI -c Release -r linux-x64 -o publish/linux-cli-x64 -p:PublishSingleFile=true --self-contained false
42+
dotnet publish PixelGraph.CLI -c Release -r osx-x64 -o publish/osx-cli-x64 -p:PublishSingleFile=true --self-contained false
4343
- name: Release Windows-CLI-x64 Binary
4444
uses: actions/upload-release-asset@v1
4545
env:

‎PixelGraph.CLI/PixelGraph.CLI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<AssemblyName>PixelGraph</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<Platforms>x64</Platforms>
9+
<Configurations>Debug;Release</Configurations>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎PixelGraph.UI/App.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
using PixelGraph.UI.Internal.Utilities;
99
using PixelGraph.UI.Windows;
1010
using Serilog;
11+
using Serilog.Events;
1112
using System;
1213
using System.Windows;
1314
using System.Windows.Threading;
14-
using PixelGraph.Common.Extensions;
15-
using Serilog.Events;
1615

1716
#if !NORENDER
1817
using PixelGraph.Rendering.Models;

‎PixelGraph.UI/Internal/Tabs/TabPreviewContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public TabPreviewContext(IServiceProvider provider)
3737
{
3838
lockHandle = new object();
3939

40-
#if !RELEASENORENDER
40+
#if !NORENDER
4141
Mesh = provider.GetRequiredService<MultiPartMeshBuilder>();
4242
#endif
4343
}

‎PixelGraph.UI/PixelGraph.UI.csproj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<PropertyGroup Condition="'$(Configuration)'=='ReleaseNoRender'">
22-
<DefineConstants>$(DefineConstants);NORENDER</DefineConstants>
22+
<DefineConstants>NORENDER</DefineConstants>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
@@ -133,17 +133,4 @@
133133
</Resource>
134134
<Resource Include="Resources\unknown_pack.png" />
135135
</ItemGroup>
136-
137-
<ItemGroup>
138-
<Compile Update="Windows\TermsOfServiceWindow.xaml.cs">
139-
<SubType>Code</SubType>
140-
</Compile>
141-
</ItemGroup>
142-
143-
<ItemGroup>
144-
<Page Update="Windows\TermsOfServiceWindow.xaml">
145-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
146-
<SubType>Designer</SubType>
147-
</Page>
148-
</ItemGroup>
149136
</Project>

‎PixelGraph.UI/ViewModels/MainWindowViewModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
using System.Windows.Input;
3333
using System.Windows.Threading;
3434

35-
#if !NORENDER
35+
#if NORENDER
36+
using PixelGraph.UI.Models.MockScene;
37+
#else
3638
using PixelGraph.Rendering.Models;
3739
using PixelGraph.UI.Models.Scene;
3840
#endif

‎PixelGraph.UI/Windows/MainWindow.xaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ public MainWindow(IServiceProvider provider)
6161
Model.Initialize(provider);
6262

6363
RecentProjects.Initialize(provider);
64-
scenePropertiesPanel.Initialize(provider);
6564
MatPropertiesPanel.Initialize(provider);
6665
FilterEditor.Initialize(provider);
6766

6867
#if !NORENDER
68+
scenePropertiesPanel.Initialize(provider);
69+
6970
Model.SceneProperties.DynamicSkyChanged += OnScenePropertiesDynamicSkyChanged;
7071
Model.SceneProperties.EnvironmentChanged += OnScenePropertiesEnvironmentChanged;
7172

‎PixelGraph.sln

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ Global
3131
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
3232
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Debug|x64.ActiveCfg = Debug|x64
3333
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Debug|x64.Build.0 = Debug|x64
34-
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|Any CPU.ActiveCfg = Release|x64
35+
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|Any CPU.Build.0 = Release|x64
3636
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|x64.ActiveCfg = Release|x64
3737
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Release|x64.Build.0 = Release|x64
38-
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.ReleaseNoRender|Any CPU.ActiveCfg = Release|Any CPU
39-
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.ReleaseNoRender|Any CPU.Build.0 = Release|Any CPU
38+
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.ReleaseNoRender|Any CPU.ActiveCfg = Release|x64
4039
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.ReleaseNoRender|x64.ActiveCfg = Release|x64
41-
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.ReleaseNoRender|x64.Build.0 = Release|x64
4240
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Test|Any CPU.ActiveCfg = Release|Any CPU
4341
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Test|Any CPU.Build.0 = Release|Any CPU
4442
{0D1C35BD-3FA2-427A-A84E-FDE3201B14E4}.Test|x64.ActiveCfg = Debug|x64
@@ -47,12 +45,12 @@ Global
4745
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4846
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Debug|x64.ActiveCfg = Debug|x64
4947
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Debug|x64.Build.0 = Debug|x64
50-
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|Any CPU.ActiveCfg = Release|x64
49+
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|Any CPU.Build.0 = Release|x64
5250
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|x64.ActiveCfg = Release|x64
5351
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Release|x64.Build.0 = Release|x64
54-
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|Any CPU.ActiveCfg = Release|Any CPU
55-
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|Any CPU.Build.0 = Release|Any CPU
52+
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|Any CPU.ActiveCfg = Release|x64
53+
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|Any CPU.Build.0 = Release|x64
5654
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|x64.ActiveCfg = Release|x64
5755
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.ReleaseNoRender|x64.Build.0 = Release|x64
5856
{DCA6D37D-161D-4997-B8F0-CC7D1BEDA25D}.Test|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,8 +67,8 @@ Global
6967
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.Release|x64.Build.0 = Release|x64
7068
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|Any CPU.ActiveCfg = ReleaseNoRender|Any CPU
7169
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|Any CPU.Build.0 = ReleaseNoRender|Any CPU
72-
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|x64.ActiveCfg = Release|x64
73-
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|x64.Build.0 = Release|x64
70+
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|x64.ActiveCfg = ReleaseNoRender|x64
71+
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.ReleaseNoRender|x64.Build.0 = ReleaseNoRender|x64
7472
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.Test|Any CPU.ActiveCfg = Release|Any CPU
7573
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.Test|x64.ActiveCfg = Debug|x64
7674
{58FC91C8-5100-40C2-9E16-5863E93E18B0}.Test|x64.Build.0 = Debug|x64
@@ -81,7 +79,6 @@ Global
8179
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
8280
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.Release|x64.ActiveCfg = Release|x64
8381
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.ReleaseNoRender|Any CPU.ActiveCfg = Release|Any CPU
84-
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.ReleaseNoRender|Any CPU.Build.0 = Release|Any CPU
8582
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.ReleaseNoRender|x64.ActiveCfg = Release|x64
8683
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.Test|Any CPU.ActiveCfg = Release|Any CPU
8784
{F890D8CF-90E6-4806-A631-782EEA7C8AFC}.Test|Any CPU.Build.0 = Release|Any CPU
@@ -107,14 +104,12 @@ Global
107104
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Debug|Any CPU.Build.0 = Debug|Any CPU
108105
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Debug|x64.ActiveCfg = Debug|x64
109106
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Debug|x64.Build.0 = Debug|x64
110-
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|Any CPU.ActiveCfg = Release|Any CPU
111-
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|Any CPU.ActiveCfg = Release|x64
108+
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|Any CPU.Build.0 = Release|x64
112109
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|x64.ActiveCfg = Release|x64
113110
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Release|x64.Build.0 = Release|x64
114-
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.ReleaseNoRender|Any CPU.ActiveCfg = Release|Any CPU
115-
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.ReleaseNoRender|Any CPU.Build.0 = Release|Any CPU
111+
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.ReleaseNoRender|Any CPU.ActiveCfg = Release|x64
116112
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.ReleaseNoRender|x64.ActiveCfg = Release|x64
117-
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.ReleaseNoRender|x64.Build.0 = Release|x64
118113
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Test|Any CPU.ActiveCfg = Debug|Any CPU
119114
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Test|Any CPU.Build.0 = Debug|Any CPU
120115
{6BA6057F-2D3B-4F89-B934-B55820ED121C}.Test|x64.ActiveCfg = Debug|x64

0 commit comments

Comments
 (0)