Skip to content
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
4 changes: 2 additions & 2 deletions Mirage.CodeGen/Mirage.CodeGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

Expand All @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mirage\Mirage.csproj" />
<ProjectReference Include="..\Mirage.Core\Mirage.Core.csproj" />
<ProjectReference Include="..\UnityEngine\FakeUnityEngine.csproj" />
</ItemGroup>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions Mirage/Mirage.csproj → Mirage.Core/Mirage.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -20,7 +20,7 @@


<PropertyGroup>
<MirageCodeGenExe>../Mirage.CodeGen/bin/Release/net6.0/win-x64/publish</MirageCodeGenExe>
<MirageCodeGenExe>../Mirage.CodeGen/bin/Release/net8.0/win-x64/publish</MirageCodeGenExe>
</PropertyGroup>
<ItemGroup>
<None Include="./mirage3.png" Pack="true" PackagePath="" />
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
8 changes: 4 additions & 4 deletions Mirage.Examples/Mirage.Examples.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(SolutionDir)\\Mirage.CodeGen\bin\$(ConfigurationName)\net6.0\Mirage.CodeGen.exe $(TargetPath)" />
<Exec Command="$(SolutionDir)\\Mirage.CodeGen\bin\$(ConfigurationName)\net8.0\Mirage.CodeGen.exe $(TargetPath)" />
<Error Condition="$(ExitCode) == 1" />
</Target>

<ItemGroup>
<ProjectReference Include="..\Mirage.Standalone\Mirage.Standalone.csproj" />
<ProjectReference Include="..\Mirage\Mirage.csproj" />
<ProjectReference Include="..\Mirage.Core\Mirage.Core.csproj" />
<ProjectReference Include="..\UnityEngine\FakeUnityEngine.csproj" />
</ItemGroup>

Expand Down
7 changes: 7 additions & 0 deletions Mirage.Examples/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"profiles": {
"Mirage.Examples": {
"commandName": "Project"
}
}
}
6 changes: 3 additions & 3 deletions Mirage.Logging/Logging/LogFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ public static class LogFactory
/// </summary>
private static Func<string, ILogHandler> createLoggerForType = _ => Debug.unityLogger;

public static ILogger GetLogger<T>(LogType defaultLogLevel = LogType.Warning)
public static ILogger GetLogger<T>(LogType defaultLogLevel = LogType.Log)
{
return GetLogger(typeof(T), defaultLogLevel);
}

public static ILogger GetLogger(System.Type type, LogType defaultLogLevel = LogType.Warning)
public static ILogger GetLogger(System.Type type, LogType defaultLogLevel = LogType.Log)
{
// Full name for generic type is messy, instead
if (type.IsGenericType && !type.IsGenericTypeDefinition)
Expand All @@ -39,7 +39,7 @@ public static ILogger GetLogger(System.Type type, LogType defaultLogLevel = LogT
}
}

public static ILogger GetLogger(string loggerName, LogType defaultLogLevel = LogType.Warning)
public static ILogger GetLogger(string loggerName, LogType defaultLogLevel = LogType.Log)
{
if (_loggers.TryGetValue(loggerName, out var logger))
{
Expand Down
4 changes: 2 additions & 2 deletions Mirage.Logging/Mirage.Logging.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Mirage.SocketLayer/Mirage.SocketLayer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions Mirage.Sockets/Mirage.Sockets.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions Mirage.Standalone/Mirage.Standalone.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Mirage.Logging\Mirage.Logging.csproj" />
<ProjectReference Include="..\Mirage.Sockets\Mirage.Sockets.csproj" />
<ProjectReference Include="..\Mirage\Mirage.csproj" />
<ProjectReference Include="..\Mirage.Core\Mirage.Core.csproj" />
<ProjectReference Include="..\UnityEngine\FakeUnityEngine.csproj" />
</ItemGroup>

Expand Down
20 changes: 8 additions & 12 deletions MirageStandalone.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31205.134
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mirage", "Mirage\Mirage.csproj", "{9AB16B5A-2A1A-43BA-91F6-4F994462F729}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MirageTests", "MirageTests\MirageTests.csproj", "{BF78519A-26E3-42C5-8A24-0D338EBA4ECB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mirage.CodeGen", "Mirage.CodeGen\Mirage.CodeGen.csproj", "{5199C4D1-37C3-4E85-B31B-910E6D496964}"
ProjectSection(ProjectDependencies) = postProject
{9AB16B5A-2A1A-43BA-91F6-4F994462F729} = {9AB16B5A-2A1A-43BA-91F6-4F994462F729}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mirage.Examples", "Mirage.Examples\Mirage.Examples.csproj", "{97A81575-12E2-457C-9087-1A10CB684FF4}"
ProjectSection(ProjectDependencies) = postProject
{9AB16B5A-2A1A-43BA-91F6-4F994462F729} = {9AB16B5A-2A1A-43BA-91F6-4F994462F729}
{5199C4D1-37C3-4E85-B31B-910E6D496964} = {5199C4D1-37C3-4E85-B31B-910E6D496964}
EndProjectSection
EndProject
Expand All @@ -33,16 +27,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mirage.Sockets", "Mirage.So
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mirage.Standalone", "Mirage.Standalone\Mirage.Standalone.csproj", "{AA57D607-B187-4964-922E-F312C3DC4792}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mirage.Core", "Mirage.Core\Mirage.Core.csproj", "{9E3F7884-7F58-4BA0-BB71-01CD478DFB89}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9AB16B5A-2A1A-43BA-91F6-4F994462F729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AB16B5A-2A1A-43BA-91F6-4F994462F729}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AB16B5A-2A1A-43BA-91F6-4F994462F729}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AB16B5A-2A1A-43BA-91F6-4F994462F729}.Release|Any CPU.Build.0 = Release|Any CPU
{BF78519A-26E3-42C5-8A24-0D338EBA4ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF78519A-26E3-42C5-8A24-0D338EBA4ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF78519A-26E3-42C5-8A24-0D338EBA4ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -75,6 +67,10 @@ Global
{AA57D607-B187-4964-922E-F312C3DC4792}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA57D607-B187-4964-922E-F312C3DC4792}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA57D607-B187-4964-922E-F312C3DC4792}.Release|Any CPU.Build.0 = Release|Any CPU
{9E3F7884-7F58-4BA0-BB71-01CD478DFB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9E3F7884-7F58-4BA0-BB71-01CD478DFB89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E3F7884-7F58-4BA0-BB71-01CD478DFB89}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E3F7884-7F58-4BA0-BB71-01CD478DFB89}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 3 additions & 3 deletions MirageTests/MirageTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mirage\Mirage.csproj" />
<ProjectReference Include="..\Mirage.Core\Mirage.Core.csproj" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Mirage is a rolling-release high-level API for the Unity Game Engine that provid

## Install

Requires installation of .NET 8: https://dotnet.microsoft.com/en-us/download/dotnet/8.0

Either add source code to your project, or add the [nuget package](https://www.nuget.org/packages/MirageNet.Mirage/)

## Adding Weaver to project
Expand Down