Skip to content

Commit 56ec1c8

Browse files
committed
Merge remote-tracking branch 'uwx/feature/math-3.0' into feature/math-3.0
2 parents c3ac0c0 + 5fcac20 commit 56ec1c8

3,056 files changed

Lines changed: 496574 additions & 432668 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/dotnet.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Restore
8888
run: dotnet restore --runtime ${{ matrix.rid }}
8989
- name: Test
90-
run: dotnet test -c Release --no-restore --runtime ${{ matrix.rid }} --collect:"XPlat Code Coverage" --results-directory ./coverage --logger:"trx"
90+
run: dotnet test --results-directory coverage --coverage --coverage-output-format cobertura --report-trx -c Release
9191
# TODO: https://github.com/dorny/test-reporter?tab=readme-ov-file#recommended-setup-for-public-repositories
9292
#- name: Test Report
9393
# uses: dorny/test-reporter@v1
@@ -100,7 +100,8 @@ jobs:
100100
uses: actions/upload-artifact@v4
101101
with:
102102
name: coverage-${{ matrix.name }}
103-
path: ./coverage/**/coverage.cobertura.xml
103+
path: ./coverage/**/*.cobertura.xml
104+
if-no-files-found: error
104105
Report-Coverage:
105106
name: "Report Coverage"
106107
runs-on: ubuntu-latest
@@ -119,7 +120,7 @@ jobs:
119120
- name: Generate Report
120121
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.9
121122
with:
122-
reports: './coverage/**/**/coverage.cobertura.xml'
123+
reports: './coverage/**/*.cobertura.xml'
123124
targetdir: './coveragereport'
124125
reporttypes: 'Cobertura'
125126
verbosity: 'Info'

.silktouch/91c9aa14a031651f.stout

-218 KB
Binary file not shown.

.silktouch/c8c046b328b09d23.stout

-226 KB
Binary file not shown.

.silktouch/openal-clangsharp.stout

40 KB
Binary file not shown.

.silktouch/opengl-clangsharp.stout

227 KB
Binary file not shown.

.silktouch/sdl-clangsharp.stout

225 KB
Binary file not shown.

Directory.Packages.props

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
77
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
88
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
9-
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
9+
<PackageVersion Include="NUnit3TestAdapter" Version="6.0.1" />
1010
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
1111
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
1212
<PackageVersion Include="NUnit" Version="4.4.0" />
13-
<PackageVersion Include="xunit" Version="2.9.3" />
13+
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
1414
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
1515
<!-- eng/benchmarks -->
1616
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
@@ -21,7 +21,7 @@
2121
<!-- Analyzers -->
2222
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25218.8" />
2323
<!-- SilkTouch -->
24-
<PackageVersion Include="ClangSharp.PInvokeGenerator" Version="20.1.2.4" />
24+
<PackageVersion Include="ClangSharp.PInvokeGenerator" Version="21.1.8.3" />
2525
<PackageVersion Include="CSharpier.Core" Version="0.30.2" />
2626
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
2727
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.1" />
@@ -40,8 +40,11 @@
4040
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
4141
<PackageVersion Include="System.IO.Hashing" Version="10.0.0" />
4242
<!-- SilkTouch Unit Tests -->
43-
<PackageVersion Include="Silk.NET.BuildTools" Version="2.22.0" />
43+
<PackageVersion Include="Silk.NET.BuildTools" Version="2.23.0-pr2526.5226" />
4444
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
4545
<PackageVersion Include="Verify.NUnit" Version="31.6.0" />
46+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
47+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
48+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
4649
</ItemGroup>
47-
</Project>
50+
</Project>

Silk.NET.sln

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{12B4D1
116116
EndProject
117117
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenAL", "OpenAL", "{662A1AEC-91F2-48FA-AA29-6F27038D30F2}"
118118
EndProject
119-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial001.HelloSound", "examples\CSharp\OpenAL\Tutorial001.HelloSound\Tutorial001.HelloSound.csproj", "{946C912C-5BBB-446A-A566-0D1696D19F59}"
119+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAL.Tutorial001.HelloSound", "examples\CSharp\OpenAL\Tutorial001.HelloSound\OpenAL.Tutorial001.HelloSound.csproj", "{946C912C-5BBB-446A-A566-0D1696D19F59}"
120+
EndProject
121+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.Tutorial001.HelloWindow", "examples\CSharp\SDL\Tutorial001.HelloWindow\SDL.Tutorial001.HelloWindow.csproj", "{3444151F-2DE3-41BC-B5E0-EFBF0091C087}"
122+
EndProject
123+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{96567E92-4A89-4AC8-9F20-C2A3FE644D10}"
124+
EndProject
125+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Soft.Native", "sources\OpenAL\Soft.Native\Silk.NET.OpenAL.Soft.Native.csproj", "{72256365-2C76-4E60-9CF0-A4FFF6F3843F}"
120126
EndProject
121127
Global
122128
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -196,7 +202,15 @@ Global
196202
{946C912C-5BBB-446A-A566-0D1696D19F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
197203
{946C912C-5BBB-446A-A566-0D1696D19F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
198204
{946C912C-5BBB-446A-A566-0D1696D19F59}.Release|Any CPU.Build.0 = Release|Any CPU
199-
EndGlobalSection
205+
{3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
206+
{3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Debug|Any CPU.Build.0 = Debug|Any CPU
207+
{3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Release|Any CPU.ActiveCfg = Release|Any CPU
208+
{3444151F-2DE3-41BC-B5E0-EFBF0091C087}.Release|Any CPU.Build.0 = Release|Any CPU
209+
{72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
210+
{72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Debug|Any CPU.Build.0 = Debug|Any CPU
211+
{72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Release|Any CPU.ActiveCfg = Release|Any CPU
212+
{72256365-2C76-4E60-9CF0-A4FFF6F3843F}.Release|Any CPU.Build.0 = Release|Any CPU
213+
EndGlobalSection
200214
GlobalSection(SolutionProperties) = preSolution
201215
HideSolutionNode = FALSE
202216
EndGlobalSection
@@ -235,6 +249,9 @@ Global
235249
{946C912C-5BBB-446A-A566-0D1696D19F59} = {662A1AEC-91F2-48FA-AA29-6F27038D30F2}
236250
{5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
237251
{E5E8FFBF-1319-4D33-B084-E732656E8A04} = {5E20252F-E2A0-46C9-BBEF-4CE5C96D0E07}
252+
{96567E92-4A89-4AC8-9F20-C2A3FE644D10} = {12B4D1CB-8938-4EC4-8895-79C4E6ABD1E8}
253+
{3444151F-2DE3-41BC-B5E0-EFBF0091C087} = {96567E92-4A89-4AC8-9F20-C2A3FE644D10}
254+
{72256365-2C76-4E60-9CF0-A4FFF6F3843F} = {AF13F7C9-4EE2-403E-B3D2-C4C2E45D9EF3}
238255
EndGlobalSection
239256
GlobalSection(ExtensibilityGlobals) = postSolution
240257
SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384}

eng/build/Build.Publishing.cs

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,21 @@ partial class Build
4646

4747
AbsolutePath OutputPackageDir => RootDirectory / "artifacts" / "pkg";
4848

49-
private void RemoveTemporaryFeeds()
50-
{
51-
try
52-
{
53-
if (DotNet("nuget list source").Any(x => x.Text.Contains(TemporaryNuGetFeed)))
54-
{
55-
DotNet($"nuget remove source \"{TemporaryNuGetFeed}\"");
56-
}
57-
}
58-
catch
59-
{
60-
// probably hasn't existed yet, don't care.
61-
}
62-
}
49+
AbsolutePath NuGetConfigFile => TemporaryDirectory / "push.nuget.config";
50+
51+
private void RemoveTemporaryFeeds() => NuGetConfigFile.DeleteFile();
6352

6453
private IEnumerable<Output> AddTemporaryFeed()
6554
{
66-
if (NugetFeed.Contains("nuget.org"))
67-
{
68-
return [];
69-
}
55+
NuGetConfigFile.WriteAllText(
56+
"<?xml version=\"1.0\" encoding=\"utf-8\"?><configuration><packageSources><clear />"
57+
+ "</packageSources></configuration>"
58+
);
7059

7160
var srcSettings = new DotNetNuGetAddSourceSettings()
7261
.SetName(TemporaryNuGetFeed)
73-
.SetSource(NugetFeed);
62+
.SetSource(NugetFeed)
63+
.SetConfigFile(NuGetConfigFile);
7464

7565
if (NugetUsername is null != NugetPassword is null)
7666
{
@@ -130,7 +120,8 @@ DotNetNuGetPushSettings NuGetPushSettings
130120
var ret = new DotNetNuGetPushSettings()
131121
.SetNoServiceEndpoint(NugetNoServiceEndpoint)
132122
.EnableSkipDuplicate()
133-
.SetSource(NugetFeed.Contains("nuget.org") ? "nuget.org" : TemporaryNuGetFeed);
123+
.SetSource(NugetFeed.Contains("nuget.org") ? "nuget.org" : TemporaryNuGetFeed)
124+
.AddProcessAdditionalArguments("--configfile", NuGetConfigFile);
134125
if (NugetApiKey is not null)
135126
{
136127
ret = ret.SetApiKey(NugetApiKey);

0 commit comments

Comments
 (0)