Skip to content

Commit

Permalink
Update to .NET 6 and MonoGame 3.8.1.303
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReMinoer
ReMinoer committed Aug 6, 2022
1 parent def2879 commit a0000c0
Show file tree
Hide file tree
Showing 23 changed files with 26 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Calame.App/Calame.App.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>$(TargetFramework)</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion Calame.DocumentContexts/Calame.DocumentContexts.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
4 changes: 2 additions & 2 deletions Calame.Icons/Calame.Icons.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand All @@ -24,6 +24,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
<PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189" PrivateAssets="All" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" PrivateAssets="All" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Calame.Viewer/Calame.Viewer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
13 changes: 3 additions & 10 deletions Calame.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
# Visual Studio Version 17
VisualStudioVersion = 17.1.32407.343
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{BE0BEC3B-45B1-4C4E-BCE0-5CBCD28D8475}"
EndProject
Expand Down Expand Up @@ -119,12 +119,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gemini", "External\gemini\s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calame.DocumentContexts", "Calame.DocumentContexts\Calame.DocumentContexts.csproj", "{4494C77C-503F-4519-906F-92D2E3119C4F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calame.Parallax", "Modules\Calame.Parallax\Calame.Parallax.csproj", "{7FB37B72-92E6-4DE4-B086-CA613A2A9AC8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calame.Parallax", "Modules\Calame.Parallax\Calame.Parallax.csproj", "{7FB37B72-92E6-4DE4-B086-CA613A2A9AC8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calame.ViewGraph", "Modules\Calame.ViewGraph\Calame.ViewGraph.csproj", "{34FA9CF2-982E-4525-A36E-CF8D2A3CD418}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calame.UndoRedo", "Modules\Calame.UndoRedo\Calame.UndoRedo.csproj", "{799B4146-1DA6-47DE-854B-AE86E0D0589A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -355,10 +353,6 @@ Global
{34FA9CF2-982E-4525-A36E-CF8D2A3CD418}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34FA9CF2-982E-4525-A36E-CF8D2A3CD418}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34FA9CF2-982E-4525-A36E-CF8D2A3CD418}.Release|Any CPU.Build.0 = Release|Any CPU
{799B4146-1DA6-47DE-854B-AE86E0D0589A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{799B4146-1DA6-47DE-854B-AE86E0D0589A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{799B4146-1DA6-47DE-854B-AE86E0D0589A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{799B4146-1DA6-47DE-854B-AE86E0D0589A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -415,7 +409,6 @@ Global
{659541B0-C2A8-4F33-984F-EEB3729F8969} = {BE0BEC3B-45B1-4C4E-BCE0-5CBCD28D8475}
{7FB37B72-92E6-4DE4-B086-CA613A2A9AC8} = {95AFED7A-6211-441D-9643-10354F05477E}
{34FA9CF2-982E-4525-A36E-CF8D2A3CD418} = {95AFED7A-6211-441D-9643-10354F05477E}
{799B4146-1DA6-47DE-854B-AE86E0D0589A} = {95AFED7A-6211-441D-9643-10354F05477E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {51117004-2C3A-426A-86DF-7881F4FEF766}
Expand Down
2 changes: 1 addition & 1 deletion Calame/Calame.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
3 changes: 0 additions & 3 deletions Calame/Utils/TreeViewItemModelBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
using System.ComponentModel;
using System.Linq;
using System.Reactive.Linq;
using System.Runtime.Remoting.Contexts;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using Calame.Icons;
using Diese.Collections.Observables;
using Diese.Collections.Observables.ReadOnly;
Expand Down
2 changes: 1 addition & 1 deletion Demos/Calame.Demo.Data/Calame.Demo.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ProjectReference Include="..\..\External\Glyph\Glyph\Glyph.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189" PrivateAssets="All" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" PrivateAssets="All" />
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Demos/Calame.Demo/Calame.Demo.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>$(TargetFramework)</TargetFramework>
Expand Down
3 changes: 2 additions & 1 deletion Demos/Calame.Demo/Modules/DemoGameData/Editors.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Glyph.IO;
using Glyph.Pipeline;
using Microsoft.Extensions.Logging;
using Microsoft.Xna.Framework.Content.Pipeline;
using Microsoft.Xna.Framework.Graphics;
using Niddle;

Expand Down Expand Up @@ -187,7 +188,7 @@ void CreateFolder(string folderPath)
Directory.CreateDirectory(folderPath);
}

Instance = new RawContentLibrary(graphicsDeviceService, logger, RawRootPath, cacheRootPath);
Instance = new RawContentLibrary(graphicsDeviceService, logger, TargetPlatform.Windows, RawRootPath, cacheRootPath);
return Instance;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net6.0-windows</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion External/Glyph
Submodule Glyph updated 33 files
+6 −0 Demos/Directory.Build.props
+1 −1 Demos/Glyph.Demos.Default/Glyph.Demos.Default.csproj
+2 −5 Demos/Glyph.Demos.DropAssets/Glyph.Demos.DropAssets.csproj
+3 −1 Demos/Glyph.Demos.DropAssets/Program.cs
+1 −1 Demos/Glyph.Demos.PrimitiveRendering/Glyph.Demos.PrimitiveRendering.csproj
+1 −1 Directory.Build.props
+1 −1 External/Fingear
+1 −1 External/MonoGame.Framework.WpfInterop
+1 −1 Glyph.Animation/Glyph.Animation.csproj
+1 −1 Glyph.Audio/Glyph.Audio.csproj
+1 −1 Glyph.Composition/Glyph.Composition.csproj
+1 −1 Glyph.Core/Glyph.Core.csproj
+1 −1 Glyph.Effects/Glyph.Effects.csproj
+1 −1 Glyph.Engine/Glyph.Engine.csproj
+6 −3 Glyph.Engine/GlyphGame.cs
+1 −1 Glyph.Graphics.Particles/Glyph.Graphics.Particles.csproj
+1 −1 Glyph.Graphics/Glyph.Graphics.csproj
+1 −1 Glyph.Particles/Glyph.Particles.csproj
+1 −1 Glyph.Physics/Glyph.Physics.csproj
+4 −3 Glyph.Pipeline/ContentProcessorUtils.cs
+2 −2 Glyph.Pipeline/Glyph.Pipeline.csproj
+4 −3 Glyph.Pipeline/RawContentLibrary.cs
+1 −1 Glyph.Scripting/Glyph.Scripting.csproj
+1 −1 Glyph.Space/Glyph.Space.csproj
+1 −1 Glyph.Tools/Glyph.Tools.csproj
+1 −1 Glyph.UI/Glyph.UI.csproj
+3 −3 Glyph.WpfInterop/Glyph.WpfInterop.csproj
+14 −2 Glyph.WpfInterop/GlyphWpf.cs
+2 −2 Glyph.sln
+16 −1 Glyph/Content/Asset.cs
+13 −7 Glyph/Export/TypeImporter.cs
+2 −1 Glyph/Glyph.csproj
+4 −2 Tests/Glyph.Tests/Glyph.Tests.csproj
2 changes: 1 addition & 1 deletion Modules/Calame.BrushPanel/Calame.BrushPanel.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.CompositionGraph/Calame.CompositionGraph.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.DataModelTree/Calame.DataModelTree.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.DataModelViewer/Calame.DataModelViewer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.InteractionTree/Calame.InteractionTree.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.LogConsole/Calame.LogConsole.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.Parallax/Calame.Parallax.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.PropertyGrid/Calame.PropertyGrid.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.SceneGraph/Calame.SceneGraph.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.SceneViewer/Calame.SceneViewer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion Modules/Calame.ViewGraph/Calame.ViewGraph.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(TargetFramework)</TargetFramework>
<UseWPF>True</UseWPF>
Expand Down

0 comments on commit a0000c0

Please sign in to comment.