Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-25 22:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:d94e882c022db154e567a88e1395dea8262cb7cb
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0
...
compare: Ellpeck:e60d3591fff634c7776b2b2f8e7c092163988b56
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0

2 commits
d94e882c02 ... e60d3591ff

Author SHA1 Message Date
Ell
e60d3591ff updated tests to net6.0 2022-09-09 17:55:23 +02:00
Ell
a274517861 fixed non-MLEM packages being deleted in build 2022-09-09 17:55:14 +02:00
3 changed files with 7 additions and 7 deletions
Show stats Expand all files Collapse all files

2
Tests/Tests.FNA.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<VSTestLogger>nunit</VSTestLogger> <VSTestLogger>nunit</VSTestLogger>
<RootNamespace>Tests</RootNamespace> <RootNamespace>Tests</RootNamespace>
<DefineConstants>$(DefineConstants);FNA</DefineConstants> <DefineConstants>$(DefineConstants);FNA</DefineConstants>

8
Tests/Tests.csproj
View file

@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<VSTestLogger>nunit</VSTestLogger> <VSTestLogger>nunit</VSTestLogger>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MLEM.Startup\MLEM.Startup.csproj" /> <ProjectReference Include="..\MLEM.Startup\MLEM.Startup.csproj" />
<ProjectReference Include="..\MLEM.Data\MLEM.Data.csproj" /> <ProjectReference Include="..\MLEM.Data\MLEM.Data.csproj" />
<ProjectReference Include="..\MLEM.Ui\MLEM.Ui.csproj" /> <ProjectReference Include="..\MLEM.Ui\MLEM.Ui.csproj" />
<ProjectReference Include="..\MLEM\MLEM.csproj" /> <ProjectReference Include="..\MLEM\MLEM.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" /> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
<PackageReference Include="coverlet.collector" Version="3.1.2"> <PackageReference Include="coverlet.collector" Version="3.1.2">
@ -23,7 +23,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="NunitXml.TestLogger" Version="3.0.117" /> <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Content/**"> <Content Include="Content/**">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

4
build.cake
View file

@ -16,7 +16,7 @@ Task("Prepare").Does(() => {
version += "-" + buildNum; version += "-" + buildNum;
} }
DeleteFiles("**/*.nupkg"); DeleteFiles("**/MLEM*.nupkg");
}); });
Task("Build").IsDependentOn("Prepare").Does(() =>{ Task("Build").IsDependentOn("Prepare").Does(() =>{
@ -62,7 +62,7 @@ Task("Push").WithCriteria(branch == "main" || branch == "release").IsDependentOn
}; };
} }
settings.SkipDuplicate = true; settings.SkipDuplicate = true;
NuGetPush(GetFiles("**/*.nupkg"), settings); NuGetPush(GetFiles("**/MLEM*.nupkg"), settings);
}); });
Task("Document").Does(() => { Task("Document").Does(() => {