Skip to content

Commit

Permalink
[#316] Fix Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
gruenwaldlk committed Aug 12, 2023
1 parent e06c61c commit 7c2a936
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
dotnet-version: 8.x
- name: Build & Test in Release Mode
run: dotnet test --configuration Release

Expand Down
6 changes: 3 additions & 3 deletions PG.Commons/PG.Commons.Test/PG.Commons.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>AlamoEngineTools.PG.Commons.Test</PackageId>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
Expand All @@ -13,8 +13,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
8 changes: 4 additions & 4 deletions PG.Commons/PG.Commons/PG.Commons.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<Product>PG.Commons</Product>
<Title>PG.Commons</Title>
<PackageId>AlamoEngineTools.PG.Commons</PackageId>
Expand All @@ -21,9 +21,9 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.6.0"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="FluentValidation" Version="11.7.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
<PackageReference Include="Nullable" Version="1.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.DAT.Test</PackageId>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
<FileVersion>0.1.0-alpha.1</FileVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
// Copyright (c) Alamo Engine Tools and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for details.
// Copyright (c) Alamo Engine Tools and contributors. All rights reserved. Licensed under the MIT
// license. See LICENSE file in the project root for details.

using Microsoft.Extensions.DependencyInjection;
using PG.StarWarsGame.Files.DAT.Binary;
using PG.StarWarsGame.Files.DAT.Services;

namespace PG.StarWarsGame.Files.DAT.Domain;
namespace PG.StarWarsGame.Files.DAT;

/// <summary>
/// Provides methods to initialize this library.
/// Provides methods to initialize this library.
/// </summary>
public static class DatDomain
{
/// <summary>
/// Adds the requires services for this library to the service collection.
/// Adds the requires services for this library to the service collection.
/// </summary>
/// <param name="serviceCollection">The service collection to populate.</param>
public static void RegisterServices(IServiceCollection serviceCollection)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<Title>PG.StarWarsGame.Files.DAT</Title>
<Product>PG.StarWarsGame.Files.DAT</Product>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.DAT</PackageId>
Expand All @@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="System.IO.Abstractions" Version="19.2.51"/>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.MEG.Test</PackageId>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
Expand All @@ -13,8 +13,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Title>PG.StarWarsGame.Files.MEG</Title>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.MEG</PackageId>
<Product>PG.StarWarsGame.Files.MEG</Product>
Expand All @@ -19,7 +19,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="System.Collections.Immutable" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="System.Composition.AttributedModel" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="System.IO.Abstractions" Version="19.2.51"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>PG.StarWarsGame.Files.MTD</Title>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.MTD</PackageId>
<Product>PG.StarWarsGame.Files.MTD</Product>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
<FileVersion>0.1.0-alpha.1</FileVersion>
<TargetFrameworks>netstandard2.0;net7.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -18,7 +18,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="System.IO.Abstractions" Version="19.2.51"/>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<IsPackable>false</IsPackable>
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>PG.StarWarsGame.Files.Xml</Title>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Files.Xml</PackageId>
<Product>PG.StarWarsGame.Files.Xml</Product>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
<FileVersion>0.1.0-alpha.1</FileVersion>
<TargetFrameworks>netstandard2.0;net7.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Localisation.Test</PackageId>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
Expand All @@ -13,8 +13,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="coverlet.collector" Version="6.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for details.

using Microsoft.Extensions.DependencyInjection;
using PG.StarWarsGame.Files.DAT.Domain;
using PG.StarWarsGame.Files.DAT;
using PG.StarWarsGame.Localisation.Commons.Helper;

namespace PG.StarWarsGame.Localisation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Title>PG.StarWarsGame.Localisation</Title>
<Product>PG.StarWarsGame.Localisation</Product>
<PackageId>AlamoEngineTools.PG.StarWarsGame.Localisation</PackageId>
<Version>0.1.0-alpha.1</Version>
<PackageLicenseUrl>https://github.com/AlamoEngine-Tools/PetroglyphTools/blob/main/LICENSE</PackageLicenseUrl>
<PackageTags>alamo,petroglyph,glyphx</PackageTags>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
<FileVersion>0.1.0-alpha.1</FileVersion>
</PropertyGroup>
Expand All @@ -13,11 +16,11 @@
<InheritDocEnabled>true</InheritDocEnabled>
</PropertyGroup>
<PropertyGroup>
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)Generated</CompilerGeneratedFilesOutputPath>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="System.IO.Abstractions" Version="19.2.51"/>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions PG.Testing/PG.Testing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsUnixLike())">net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageId>AlamoEngineTools.PG.Testing</PackageId>
<Version>0.1.0-alpha.1</Version>
<AssemblyVersion>0.1.0-alpha.1</AssemblyVersion>
<FileVersion>0.1.0-alpha.1</FileVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.6.23329.7"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0"/>
<PackageReference Include="MSTest.TestFramework" Version="3.1.1"/>
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="19.2.51"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23371-04"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PG.Commons\PG.Commons\PG.Commons.csproj"/>
Expand Down

0 comments on commit 7c2a936

Please sign in to comment.