Merge pull request #37 from exomia/development

v1.5.0
exomia · Nov 25, 2020 · cb3ea58 · cb3ea58
2 parents 9a480db + 6e6c787
commit cb3ea58
Show file tree

Hide file tree

Showing 121 changed files with 7,773 additions and 3,705 deletions.
diff --git a/.github/workflows/build_test_and_publish.yml b/.github/workflows/build_test_and_publish.yml
@@ -52,7 +52,7 @@ jobs:
     steps:    
     - uses: actions/checkout@v2
     - name: extract tag version
-      run: echo ::set-env name=TAG_VERSION::${GITHUB_REF#refs/tags/v*}
+      run: echo "TAG_VERSION=${GITHUB_REF#refs/tags/v*}" >> $GITHUB_ENV
       shell: bash
     - uses: actions/setup-dotnet@v1   
       with:
@@ -78,7 +78,7 @@ jobs:
     steps:    
     - uses: actions/checkout@v2
     - name: extract tag version
-      run: echo ::set-env name=TAG_VERSION::${GITHUB_REF#refs/tags/v*}
+      run: echo "TAG_VERSION=${GITHUB_REF#refs/tags/v*}" >> $GITHUB_ENV
       shell: bash
     - uses: actions/setup-dotnet@v1   
       with:

diff --git a/Exomia.Framework.sln b/Exomia.Framework.sln
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exomia.Framework.Example.Ju
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exomia.Framework.BasicSetup", "examples\Exomia.Framework.BasicSetup\Exomia.Framework.BasicSetup.csproj", "{8329DE95-55FA-4176-91BF-BBC793B9EBE2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exomia.Framework.Example.Canvas", "examples\Exomia.Framework.Example.Canvas\Exomia.Framework.Example.Canvas.csproj", "{BEB473A8-DF7F-4402-97C2-0344308EE17F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,6 +110,18 @@ Global
 		{8329DE95-55FA-4176-91BF-BBC793B9EBE2}.Release|x64.Build.0 = Release|x64
 		{8329DE95-55FA-4176-91BF-BBC793B9EBE2}.Release|x86.ActiveCfg = Release|x86
 		{8329DE95-55FA-4176-91BF-BBC793B9EBE2}.Release|x86.Build.0 = Release|x86
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|x64.ActiveCfg = Debug|x64
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|x64.Build.0 = Debug|x64
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|x86.ActiveCfg = Debug|x86
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Debug|x86.Build.0 = Debug|x86
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|x64.ActiveCfg = Release|x64
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|x64.Build.0 = Release|x64
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|x86.ActiveCfg = Release|x86
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,6 +132,7 @@ Global
 		{E86DC9EB-8FC0-4C5D-95F2-206C67A069C2} = {65A2B0A0-B984-4A33-AFA5-A5E70862A10A}
 		{22EC1807-99FD-4EC1-8A86-9553CD743498} = {9D20989E-7C37-42F4-AE05-19CED958EA7A}
 		{8329DE95-55FA-4176-91BF-BBC793B9EBE2} = {9D20989E-7C37-42F4-AE05-19CED958EA7A}
+		{BEB473A8-DF7F-4402-97C2-0344308EE17F} = {9D20989E-7C37-42F4-AE05-19CED958EA7A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E4E52C8-D1D4-488D-8700-A3E45E8968BE}

diff --git a/examples/Exomia.Framework.BasicSetup/MyGame.cs b/examples/Exomia.Framework.BasicSetup/MyGame.cs
@@ -57,6 +57,7 @@ protected override void OnInitializeGameGraphicsParameters(ref GameGraphicsParam
         protected override void OnInitialize()
         {
             Content.RootDirectory = "Content";
+            _spriteBatch          = ToDispose(new SpriteBatch(GraphicsDevice));
 
             /*
              * TODO: Add your initialization logic here
@@ -67,8 +68,6 @@ protected override void OnInitialize()
         /// OnLoadContent will be called once per game and is the place to load all of your content.
         protected override void OnLoadContent()
         {
-            _spriteBatch = ToDispose(new SpriteBatch(GraphicsDevice));
-
             /*
              * TODO: use base.Content to load your game content here
              */

diff --git a/examples/Exomia.Framework.Example.Canvas/Content/logo1.jpg b/examples/Exomia.Framework.Example.Canvas/Content/logo1.jpg
diff --git a/examples/Exomia.Framework.Example.Canvas/Content/logo2.png b/examples/Exomia.Framework.Example.Canvas/Content/logo2.png
diff --git a/examples/Exomia.Framework.Example.Canvas/Exomia.Framework.Example.Canvas.csproj b/examples/Exomia.Framework.Example.Canvas/Exomia.Framework.Example.Canvas.csproj
@@ -0,0 +1,61 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <Platforms>AnyCPU;x64;x86</Platforms>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <NullableReferenceTypes>true</NullableReferenceTypes>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>1.0.0</Version>
+    <Authors>baetz</Authors>
+    <Description></Description>
+    <Copyright>Copyright © $([System.DateTime]::Now.Year) baetz</Copyright>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants Condition="'$(Platform)'=='AnyCPU'">DEBUG;TRACE;x86</DefineConstants>
+    <DefineConstants Condition="'$(Platform)'!='AnyCPU'">DEBUG;TRACE;$(Platform)</DefineConstants>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <DefineConstants Condition="'$(Platform)'=='AnyCPU'">TRACE;x86</DefineConstants>
+    <DefineConstants Condition="'$(Platform)'!='AnyCPU'">TRACE;$(Platform)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>1701;1702;IDE0063</NoWarn>
+    <WarningsAsErrors>NU1605</WarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)'=='AnyCPU'">
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <PackageId>$(MSBuildProjectName)</PackageId>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Platform)'!='AnyCPU'">
+    <AssemblyName>$(MSBuildProjectName).$(Platform)</AssemblyName>
+    <PackageId>$(MSBuildProjectName).$(Platform)</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Exomia.Framework\Exomia.Framework.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Content\logo1.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Content\logo2.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>