Skip to content

Migrate to .NET 8.0 / Migrate from libman to npm #23

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.

Sign up for GitHub

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

Open
Miragecoder wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Migrate to .NET 8.0 / Migrate from libman to npm #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9b6fd1
Fix build for .NET 8.0
Miragecoder Dec 15, 2025
2c53458
Misc tweaks
Miragecoder Dec 15, 2025
da0b716
Update Readme
Miragecoder Dec 15, 2025
b479e49
Automatically expose the webserver
Miragecoder Dec 15, 2025
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
5 changes: 3 additions & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ Note: Availability and performance may vary. If the link doesn't work, you can a
1. Clone the repository
2. Build the solution
3. Run the (primarily, integration) tests
4. Run the *Mirage.Urbanization.WinForms*-project (if you wish to run from your desktop)
4. Inside the *Mirage.Urbanization.Web*-project directory, invoke both 'npm install' and 'npm run copy:libs';
5. Run the *Mirage.Urbanization.Web*-project (if you wish to host a web server)
6. Run the *Mirage.Urbanization.WinForms*-project (if you wish to run from your desktop)

## Usage

Run the *Mirage.Urbanization.WinForms*-project and use the application by intuition like any other windows application. The *Mirage.Urbanization.Web*-project can be utilized if you wish to run the web version of the game. Starting the *web*-project will immediately start a web server on all network devices, on port 80. (Http)
Run the *Mirage.Urbanization.WinForms*-project and use the application by intuition like any other windows application. The *Mirage.Urbanization.Web*-project can be utilized if you wish to run the web version of the game. Starting the *web*-project will immediately start a web server on all network devices, on port 5000. (Http)

You can also start a web server from within an instance of *Mirage.Urbanization.WinForms*; allowing access to the game session that is taking place inside the desktop app from the web.

Expand Down
2 changes: 1 addition & 1 deletion src/Mirage.Urbanization.Charts/Mirage.Urbanization.Charts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{BB0C4FF4-50B5-4D4B-887C-20F9E0775D1A}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>Mirage.Urbanization.Charts</AssemblyTitle>
<Product>Mirage.Urbanization.Charts</Product>
<Copyright>Copyright © 2015</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion src/Mirage.Urbanization.Resources/Mirage.Urbanization.Tilesets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{73BBFBFD-14A4-40EA-87B5-E1BF9BAF42F7}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>Mirage.Urbanization.Resources</AssemblyTitle>
<Product>Mirage.Urbanization.Resources</Product>
Expand Down
2 changes: 1 addition & 1 deletion src/Mirage.Urbanization.Simulation/Mirage.Urbanization.Simulation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{5A699402-01AE-484E-A489-FD500E868A0C}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyTitle>Mirage.Urbanization.Simulation</AssemblyTitle>
<Product>Mirage.Urbanization.Simulation</Product>
<Copyright>Copyright © 2014</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion src/Mirage.Urbanization.Test/Mirage.Urbanization.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{3DE230BD-C236-4200-BB77-8E7FF799E413}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
Expand Down
90 changes: 46 additions & 44 deletions src/Mirage.Urbanization.Web/Mirage.Urbanization.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{E80D47E8-22C1-4CE4-AC67-7F3AB2FCBFE7}</ProjectGuid>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>Mirage.Urbanization.Web</AssemblyTitle>
<Product>Mirage.Urbanization.Web</Product>
<Copyright>Copyright © 2015</Copyright>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>bin\$(Configuration)\</OutputPath>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup>
<StartupObject>Mirage.Urbanization.Web.Program</StartupObject>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mirage.Urbanization.Charts\Mirage.Urbanization.Charts.csproj" />
<ProjectReference Include="..\Mirage.Urbanization.Resources\Mirage.Urbanization.Tilesets.csproj" />
<ProjectReference Include="..\Mirage.Urbanization.Simulation\Mirage.Urbanization.Simulation.csproj" />
<ProjectReference Include="..\Mirage.Urbanization\Mirage.Urbanization.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Mirage.Urbanization.WinForms\urbanization.ico">
<Link>Www\urbanization.ico</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Www\**\*" />
</ItemGroup>
<PropertyGroup>
<ProjectGuid>{E80D47E8-22C1-4CE4-AC67-7F3AB2FCBFE7}</ProjectGuid>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>Mirage.Urbanization.Web</AssemblyTitle>
<Product>Mirage.Urbanization.Web</Product>
<Copyright>Copyright © 2015</Copyright>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>bin\$(Configuration)\</OutputPath>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<PropertyGroup>
<StartupObject>Mirage.Urbanization.Web.Program</StartupObject>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mirage.Urbanization.Charts\Mirage.Urbanization.Charts.csproj" />
<ProjectReference Include="..\Mirage.Urbanization.Resources\Mirage.Urbanization.Tilesets.csproj" />
<ProjectReference Include="..\Mirage.Urbanization.Simulation\Mirage.Urbanization.Simulation.csproj" />
<ProjectReference Include="..\Mirage.Urbanization\Mirage.Urbanization.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Mirage.Urbanization.WinForms\urbanization.ico">
<Link>Www\urbanization.ico</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Www\**\*" />
</ItemGroup>
<Target Name="PreBuildNpm" BeforeTargets="BeforeBuild">
<Exec Command="npm install" />
<Exec Command="npm run copy:libs" />
</Target>
</Project>
1 change: 1 addition & 0 deletions src/Mirage.Urbanization.Web/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
webBuilder.UseUrls("http://0.0.0.0:5000");
});

private static void Instance_OnLogMessage(object sender, LogEventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion src/Mirage.Urbanization.Web/Www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<meta name="msapplication-config" content="/icons/browserconfig.xml">
<meta name="theme-color" content="#ffffff">

<link rel="stylesheet" href="scripts/jqueryui/themes/base/jquery-ui.min.css">
<link rel="stylesheet" href="scripts/jqueryui/dist/themes/base/jquery-ui.min.css">
<link href="game/game.css" rel="stylesheet">
</head>

Expand Down
22 changes: 0 additions & 22 deletions src/Mirage.Urbanization.Web/libman.json
View file
Open in desktop

This file was deleted.

Loading