Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setup branch for endwalker updates #59

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BootstrappedConsole/AppContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ private void SetupSharlayanManager() {
ProcessModel = new ProcessModel {
Process = process,
},
UseLocalCache = false,
};
MemoryHandler handler = SharlayanMemoryManager.Instance.AddHandler(sharlayanConfiguration);
handler.OnException += delegate { };
Expand Down
7 changes: 3 additions & 4 deletions BootstrappedConsole/BootstrappedConsole.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -16,9 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NLog" Version="4.7.0" />
<PackageReference Include="NLog.Config" Version="4.7.0" />
<PackageReference Include="NLog.Schema" Version="4.7.0" />
<PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="NLog.Schema" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 5 additions & 7 deletions BootstrappedElectron/BootstrappedElectron.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
<IsPackable>false</IsPackable>
Expand All @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ElectronNET.API" Version="11.5.1" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.6" />
<PackageReference Include="ElectronNET.API" Version="13.5.1" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.1" />
</ItemGroup>

<ItemGroup>
Expand All @@ -34,14 +34,12 @@
</Content>
</ItemGroup>

<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build"
Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
<!-- Ensure Node.js is installed -->
<Exec Command="node --version" ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
</Exec>
<Error Condition="'$(ErrorCode)' != '0'"
Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
</Target>
Expand Down
1 change: 1 addition & 0 deletions BootstrappedElectron/ClientApp/.env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
BROWSER=none
SKIP_PREFLIGHT_CHECK=true
3 changes: 2 additions & 1 deletion BootstrappedElectron/ClientApp/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": true,
"arrowParens": "always"
"arrowParens": "always",
"endOfLine": "auto"
}
Loading