Skip to content

Commit 8c347a6

Browse files
ajtribickajtribick
committed
Reformat, update dependencies
1 parent e3d927f commit 8c347a6

37 files changed

+1583
-1661
lines changed

‎.github/workflows/build.yml‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,38 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
dotnet-version: ['6.0.x']
11+
runs-on: windows-latest
1512

1613
steps:
17-
- uses: actions/checkout@v2
18-
- name: Setup dotnet ${{ matrix.dotnet-version }}
19-
uses: actions/setup-dotnet@v1
20-
with:
21-
dotnet-version: ${{ matrix.dotnet-version }}
14+
- name: Checkout sources
15+
uses: actions/checkout@v3
16+
- name: Extract version number
17+
id: extract_version
18+
shell: pwsh
19+
run: |
20+
[xml]$csproj = Get-Content CmodConvert\CmodConvert.csproj
21+
Add-Content -Path "$env:GITHUB_OUTPUT" `
22+
-Value "version=$($csproj.Project.PropertyGroup.Version)"
2223
- name: Install dependencies
2324
run: dotnet restore
2425
- name: Build
25-
run: dotnet build --configuration Release --no-restore
26+
run: dotnet build -c Release --no-restore
2627
- name: Test
27-
run: dotnet test --no-restore --verbosity normal
28+
run: dotnet test -c Release --no-restore --no-build
29+
- name: Package
30+
run: |
31+
dotnet publish CmodConvert `
32+
-c Release `
33+
-o Publish `
34+
--no-restore `
35+
--no-build `
36+
--sc false
37+
# Remove the platform-specific .exe file before publishing
38+
rm Publish\CmodConvert.exe
39+
- name: Upload artifact
40+
uses: actions/upload-artifact@v3
41+
if: success()
42+
with:
43+
name: cmodconvert-${{ steps.extract_version.outputs.version }}
44+
path: Publish/
45+

‎CmodConvert.Test/CmodConvert.Test.csproj‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<IsTestProject>true</IsTestProject>
78
<IsPackable>false</IsPackable>
9+
<Authors>Andrew Tribick</Authors>
10+
<Copyright>ⓒ 2021–2023 Andrew Tribick</Copyright>
11+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
12+
<RepositoryUrl>https://github.com/ajtribick/cmodconvert</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<WarningsAsErrors>true</WarningsAsErrors>
815
</PropertyGroup>
916

1017
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
13-
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
14-
<PackageReference Include="coverlet.collector" Version="3.1.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
19+
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
20+
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
21+
<PackageReference Include="coverlet.collector" Version="6.0.0">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
1525
</ItemGroup>
1626

1727
<ItemGroup>

‎CmodConvert.Test/GlobalUsings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
global using Microsoft.VisualStudio.TestTools.UnitTesting;

‎CmodConvert.Test/VariantTest.cs‎

Lines changed: 89 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,108 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
namespace CmodConvert.Test;
22

3-
namespace CmodConvert.Test
3+
[TestClass]
4+
public class VariantTest
45
{
5-
[TestClass]
6-
public class VariantTest
6+
[TestMethod]
7+
public void Float1Equals()
78
{
8-
[TestMethod]
9-
public void Float1Equals()
10-
{
11-
var a = new Variant(1.0f);
12-
var b = new Variant(1.0f);
13-
var c = new Variant(2.0f);
9+
var a = new Variant(1.0f);
10+
var b = new Variant(1.0f);
11+
var c = new Variant(2.0f);
1412

15-
Assert.AreEqual(a, b);
16-
Assert.IsTrue(a == b);
17-
Assert.IsFalse(a != b);
18-
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
19-
Assert.AreNotEqual(a, c);
20-
Assert.IsFalse(a == c);
21-
Assert.IsTrue(a != c);
22-
}
13+
Assert.AreEqual(a, b);
14+
Assert.IsTrue(a == b);
15+
Assert.IsFalse(a != b);
16+
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
17+
Assert.AreNotEqual(a, c);
18+
Assert.IsFalse(a == c);
19+
Assert.IsTrue(a != c);
20+
}
2321

24-
[TestMethod]
25-
public void Float2Equals()
26-
{
27-
var a = new Variant(1.0f, 1.0f);
28-
var b = new Variant(1.0f, 1.0f);
29-
var c = new Variant(1.0f, 2.0f);
22+
[TestMethod]
23+
public void Float2Equals()
24+
{
25+
var a = new Variant(1.0f, 1.0f);
26+
var b = new Variant(1.0f, 1.0f);
27+
var c = new Variant(1.0f, 2.0f);
3028

31-
Assert.AreEqual(a, b);
32-
Assert.IsTrue(a == b);
33-
Assert.IsFalse(a != b);
34-
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
35-
Assert.AreNotEqual(a, c);
36-
Assert.IsFalse(a == c);
37-
Assert.IsTrue(a != c);
38-
}
29+
Assert.AreEqual(a, b);
30+
Assert.IsTrue(a == b);
31+
Assert.IsFalse(a != b);
32+
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
33+
Assert.AreNotEqual(a, c);
34+
Assert.IsFalse(a == c);
35+
Assert.IsTrue(a != c);
36+
}
3937

40-
[TestMethod]
41-
public void Float3Equals()
42-
{
43-
var a = new Variant(1.0f, 1.0f, 1.0f);
44-
var b = new Variant(1.0f, 1.0f, 1.0f);
45-
var c = new Variant(1.0f, 1.0f, 2.0f);
38+
[TestMethod]
39+
public void Float3Equals()
40+
{
41+
var a = new Variant(1.0f, 1.0f, 1.0f);
42+
var b = new Variant(1.0f, 1.0f, 1.0f);
43+
var c = new Variant(1.0f, 1.0f, 2.0f);
4644

47-
Assert.AreEqual(a, b);
48-
Assert.IsTrue(a == b);
49-
Assert.IsFalse(a != b);
50-
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
51-
Assert.AreNotEqual(a, c);
52-
Assert.IsFalse(a == c);
53-
Assert.IsTrue(a != c);
54-
}
45+
Assert.AreEqual(a, b);
46+
Assert.IsTrue(a == b);
47+
Assert.IsFalse(a != b);
48+
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
49+
Assert.AreNotEqual(a, c);
50+
Assert.IsFalse(a == c);
51+
Assert.IsTrue(a != c);
52+
}
5553

56-
[TestMethod]
57-
public void Float4Equals()
58-
{
59-
var a = new Variant(1.0f, 1.0f, 1.0f, 1.0f);
60-
var b = new Variant(1.0f, 1.0f, 1.0f, 1.0f);
61-
var c = new Variant(1.0f, 1.0f, 1.0f, 2.0f);
54+
[TestMethod]
55+
public void Float4Equals()
56+
{
57+
var a = new Variant(1.0f, 1.0f, 1.0f, 1.0f);
58+
var b = new Variant(1.0f, 1.0f, 1.0f, 1.0f);
59+
var c = new Variant(1.0f, 1.0f, 1.0f, 2.0f);
6260

63-
Assert.AreEqual(a, b);
64-
Assert.IsTrue(a == b);
65-
Assert.IsFalse(a != b);
66-
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
67-
Assert.AreNotEqual(a, c);
68-
Assert.IsFalse(a == c);
69-
Assert.IsTrue(a != c);
70-
}
61+
Assert.AreEqual(a, b);
62+
Assert.IsTrue(a == b);
63+
Assert.IsFalse(a != b);
64+
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
65+
Assert.AreNotEqual(a, c);
66+
Assert.IsFalse(a == c);
67+
Assert.IsTrue(a != c);
68+
}
7169

72-
[TestMethod]
73-
public void UByte4Equals()
74-
{
75-
var a = new Variant(b1: 1, b2: 1, b3: 1, b4: 1);
76-
var b = new Variant(b1: 1, b2: 1, b3: 1, b4: 1);
77-
var c = new Variant(b1: 1, b2: 1, b3: 1, b4: 2);
70+
[TestMethod]
71+
public void UByte4Equals()
72+
{
73+
var a = new Variant(b1: 1, b2: 1, b3: 1, b4: 1);
74+
var b = new Variant(b1: 1, b2: 1, b3: 1, b4: 1);
75+
var c = new Variant(b1: 1, b2: 1, b3: 1, b4: 2);
7876

79-
Assert.AreEqual(a, b);
80-
Assert.IsTrue(a == b);
81-
Assert.IsFalse(a != b);
82-
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
83-
Assert.AreNotEqual(a, c);
84-
Assert.IsFalse(a == c);
85-
Assert.IsTrue(a != c);
86-
}
77+
Assert.AreEqual(a, b);
78+
Assert.IsTrue(a == b);
79+
Assert.IsFalse(a != b);
80+
Assert.AreEqual(a.GetHashCode(), b.GetHashCode());
81+
Assert.AreNotEqual(a, c);
82+
Assert.IsFalse(a == c);
83+
Assert.IsTrue(a != c);
84+
}
8785

88-
[TestMethod]
89-
public void DifferentTypesNotEqual()
86+
[TestMethod]
87+
public void DifferentTypesNotEqual()
88+
{
89+
var variants = new[]
9090
{
91-
var variants = new[]
92-
{
93-
new Variant(1.0f),
94-
new Variant(1.0f, 1.0f),
95-
new Variant(1.0f, 1.0f, 1.0f),
96-
new Variant(1.0f, 1.0f, 1.0f, 1.0f),
97-
new Variant(b1: 1, b2: 1, b3: 1, b4: 1),
98-
};
91+
new Variant(1.0f),
92+
new Variant(1.0f, 1.0f),
93+
new Variant(1.0f, 1.0f, 1.0f),
94+
new Variant(1.0f, 1.0f, 1.0f, 1.0f),
95+
new Variant(b1: 1, b2: 1, b3: 1, b4: 1),
96+
};
9997

100-
for (int i = 0; i < variants.Length; ++i)
98+
for (int i = 0; i < variants.Length; ++i)
99+
{
100+
for (int j = 0; j < variants.Length; ++j)
101101
{
102-
for (int j = 0; j < variants.Length; ++j)
103-
{
104-
if (i == j) { continue; }
105-
Assert.AreNotEqual(variants[i], variants[j]);
106-
Assert.IsFalse(variants[i] == variants[j]);
107-
Assert.IsTrue(variants[i] != variants[j]);
108-
}
102+
if (i == j) { continue; }
103+
Assert.AreNotEqual(variants[i], variants[j]);
104+
Assert.IsFalse(variants[i] == variants[j]);
105+
Assert.IsTrue(variants[i] != variants[j]);
109106
}
110107
}
111108
}

‎CmodConvert/AttributeFormat.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
1818

19-
namespace CmodConvert
19+
namespace CmodConvert;
20+
21+
public enum AttributeFormat : short
2022
{
21-
public enum AttributeFormat : short
22-
{
23-
Float1 = 0,
24-
Float2 = 1,
25-
Float3 = 2,
26-
Float4 = 3,
27-
UByte4 = 4,
28-
}
23+
Float1 = 0,
24+
Float2 = 1,
25+
Float3 = 2,
26+
Float4 = 3,
27+
UByte4 = 4,
2928
}

‎CmodConvert/AttributeType.cs‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
1818

19-
namespace CmodConvert
19+
namespace CmodConvert;
20+
21+
public enum AttributeType : short
2022
{
21-
public enum AttributeType : short
22-
{
23-
Position = 0,
24-
Color0 = 1,
25-
Color1 = 2,
26-
Normal = 3,
27-
Tangent = 4,
28-
Texture0 = 5,
29-
Texture1 = 6,
30-
Texture2 = 7,
31-
Texture3 = 8,
32-
PointSize = 9,
33-
NextPosition = 10,
34-
ScaleFactor = 11,
35-
}
23+
Position = 0,
24+
Color0 = 1,
25+
Color1 = 2,
26+
Normal = 3,
27+
Tangent = 4,
28+
Texture0 = 5,
29+
Texture1 = 6,
30+
Texture2 = 7,
31+
Texture3 = 8,
32+
PointSize = 9,
33+
NextPosition = 10,
34+
ScaleFactor = 11,
3635
}

‎CmodConvert/BlendMode.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1717
*/
1818

19-
namespace CmodConvert
19+
namespace CmodConvert;
20+
21+
public enum BlendMode : short
2022
{
21-
public enum BlendMode : short
22-
{
23-
Normal = 0,
24-
Additive = 1,
25-
PremultipliedAlpha = 2,
26-
}
23+
Normal = 0,
24+
Additive = 1,
25+
PremultipliedAlpha = 2,
2726
}

0 commit comments

Comments
 (0)