From e3aa6d7ba9affc7c5e035bf158be9431bd378086 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 7 Oct 2020 07:15:36 +0200 Subject: [PATCH] updated to netcoreapp3.1 --- .gitmodules | 3 --- Contentless.sln | 12 ------------ Contentless/Contentless.csproj | 11 ++++++----- Contentless/Contentless.nuspec | 6 +++--- Contentless/Program.cs | 8 ++++---- MonoGame | 1 - NuGet.config | 6 ++++++ Test/Content/Content.mgcb | 2 +- Test/Test.csproj | 5 ++--- 9 files changed, 22 insertions(+), 32 deletions(-) delete mode 100644 .gitmodules delete mode 160000 MonoGame create mode 100644 NuGet.config diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4a70de7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "MonoGame"] - path = MonoGame - url = https://github.com/MonoGame/MonoGame diff --git a/Contentless.sln b/Contentless.sln index 06ce45b..c34edd7 100644 --- a/Contentless.sln +++ b/Contentless.sln @@ -4,10 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentless", "Contentless\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Content.Pipeline", "MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj", "{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.DesktopGL", "MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj", "{A8CFF376-58A8-41BB-8615-5232BB2B21EF}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -22,13 +18,5 @@ Global {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.Build.0 = Release|Any CPU - {A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.Build.0 = Release|Any CPU - {A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Contentless/Contentless.csproj b/Contentless/Contentless.csproj index 7d2427d..28a0879 100644 --- a/Contentless/Contentless.csproj +++ b/Contentless/Contentless.csproj @@ -2,7 +2,7 @@ Exe - net462 + netcoreapp3.1 @@ -10,12 +10,13 @@ - + + All - - + + All - + diff --git a/Contentless/Contentless.nuspec b/Contentless/Contentless.nuspec index c1970fc..63a9647 100644 --- a/Contentless/Contentless.nuspec +++ b/Contentless/Contentless.nuspec @@ -2,7 +2,7 @@ Contentless - 3.0.1 + 3.0.2 Ellpeck A tool for MonoGame that automatically handles adding assets to the Content Pipeline project monogame mono xna content pipeline mgcb builder tool library @@ -12,8 +12,8 @@ - + - + \ No newline at end of file diff --git a/Contentless/Program.cs b/Contentless/Program.cs index 85db459..2bd4c5d 100644 --- a/Contentless/Program.cs +++ b/Contentless/Program.cs @@ -17,7 +17,7 @@ namespace Contentless { return; } - var contentFile = new FileInfo(Path.Combine(Environment.CurrentDirectory, args[0])); + var contentFile = new FileInfo(Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, args[0]))); if (!contentFile.Exists) { Console.WriteLine($"Unable to find content file {contentFile}"); return; @@ -49,7 +49,7 @@ namespace Contentless { if (!line.StartsWith("/reference:")) continue; var reference = line.Substring(11); - var refPath = Path.Combine(contentFile.DirectoryName, reference); + var refPath = Path.GetFullPath(Path.Combine(contentFile.DirectoryName, reference)); try { Assembly.LoadFrom(refPath); Console.WriteLine($"Using reference {refPath}"); @@ -157,8 +157,8 @@ namespace Contentless { if (processor != null) processors.Add(type.Name); } - } catch { - // ignored + } catch (Exception e) { + Console.WriteLine($"Error gathering types in reference {assembly}: {e}"); } } return (importers, processors); diff --git a/MonoGame b/MonoGame deleted file mode 160000 index 661de69..0000000 --- a/MonoGame +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 661de69369ecf0f4e078551b81836586bf6c2c67 diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000..e87aac1 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Test/Content/Content.mgcb b/Test/Content/Content.mgcb index 355b90f..946a567 100644 --- a/Test/Content/Content.mgcb +++ b/Test/Content/Content.mgcb @@ -10,7 +10,7 @@ #-------------------------------- References --------------------------------# -/reference:..\bin\Debug\netcoreapp2.2\MonoGame.Extended.Content.Pipeline.dll +/reference:..\..\..\.nuget\packages\monogame.extended.content.pipeline\3.8.0\tools\MonoGame.Extended.Content.Pipeline.dll #---------------------------------- Content ---------------------------------# #begin Json/Copy.json diff --git a/Test/Test.csproj b/Test/Test.csproj index 8145730..0e52d09 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -1,12 +1,11 @@  - netcoreapp2.2 - true + netcoreapp3.1 - +