Ellpeck/Contentless
1
0
Fork 0
mirror of https://github.com/Ellpeck/Contentless.git synced 2024-12-22 03:49:22 +01:00
Code Issues Projects Releases Wiki Activity

updated to netcoreapp3.1

Browse source
This commit is contained in:
Ell 2020-10-07 07:15:36 +02:00
parent 378c0b4484
commit e3aa6d7ba9
9 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "MonoGame"]
path = MonoGame
url = https://github.com/MonoGame/MonoGame

12
Contentless.sln
View file

@ -4,10 +4,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentless", "Contentless\
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}"
EndProject 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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}.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.ActiveCfg = Release|Any CPU
{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.Build.0 = 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 EndGlobalSection
EndGlobal EndGlobal

11
Contentless/Contentless.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -10,12 +10,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj"> <PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.0.1641">
<PrivateAssets>All</PrivateAssets> <PrivateAssets>All</PrivateAssets>
</ProjectReference> </PackageReference>
<ProjectReference Include="..\MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj"> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
<PrivateAssets>All</PrivateAssets> <PrivateAssets>All</PrivateAssets>
</ProjectReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
Contentless/Contentless.nuspec
View file

@ -2,7 +2,7 @@
<package> <package>
<metadata> <metadata>
<id>Contentless</id> <id>Contentless</id>
<version>3.0.1</version> <version>3.0.2</version>
<authors>Ellpeck</authors> <authors>Ellpeck</authors>
<description>A tool for MonoGame that automatically handles adding assets to the Content Pipeline project</description> <description>A tool for MonoGame that automatically handles adding assets to the Content Pipeline project</description>
<tags>monogame mono xna content pipeline mgcb builder tool library</tags> <tags>monogame mono xna content pipeline mgcb builder tool library</tags>
@ -12,8 +12,8 @@
</metadata> </metadata>
<files> <files>
<file src="../README.md" target="README.md"/> <file src="../README.md" target="README.md"/>
<file src="_._" target="lib/net462/"/> <file src="_._" target="lib/netcoreapp3.1/"/>
<file src="Contentless.targets" target="build/Contentless.targets"/> <file src="Contentless.targets" target="build/Contentless.targets"/>
<file src="bin\Debug\net462\**\*" target="tools/"/> <file src="bin\Debug\netcoreapp3.1\**\*" target="tools/"/>
</files> </files>
</package> </package>

8
Contentless/Program.cs
View file

@ -17,7 +17,7 @@ namespace Contentless {
return; 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) { if (!contentFile.Exists) {
Console.WriteLine($"Unable to find content file {contentFile}"); Console.WriteLine($"Unable to find content file {contentFile}");
return; return;
@ -49,7 +49,7 @@ namespace Contentless {
if (!line.StartsWith("/reference:")) if (!line.StartsWith("/reference:"))
continue; continue;
var reference = line.Substring(11); var reference = line.Substring(11);
var refPath = Path.Combine(contentFile.DirectoryName, reference); var refPath = Path.GetFullPath(Path.Combine(contentFile.DirectoryName, reference));
try { try {
Assembly.LoadFrom(refPath); Assembly.LoadFrom(refPath);
Console.WriteLine($"Using reference {refPath}"); Console.WriteLine($"Using reference {refPath}");
@ -157,8 +157,8 @@ namespace Contentless {
if (processor != null) if (processor != null)
processors.Add(type.Name); processors.Add(type.Name);
} }
} catch { } catch (Exception e) {
// ignored Console.WriteLine($"Error gathering types in reference {assembly}: {e}");
} }
} }
return (importers, processors); return (importers, processors);

1
MonoGame

@ -1 +0,0 @@
Subproject commit 661de69369ecf0f4e078551b81836586bf6c2c67

6
NuGet.config Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="globalPackagesFolder" value="..\.nuget\packages" />
</config>
</configuration>

2
Test/Content/Content.mgcb
View file

@ -10,7 +10,7 @@
#-------------------------------- References --------------------------------# #-------------------------------- 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 ---------------------------------# #---------------------------------- Content ---------------------------------#
#begin Json/Copy.json #begin Json/Copy.json

5
Test/Test.csproj
View file

@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.7.0" /> <PackageReference Include="MonoGame.Extended.Content.Pipeline" Version="3.8.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>