Skip to content

Commit 8c26755

Browse files
committed
Merge branch 'feature/release-2.23' into ci/feature/release-2.23/moltenvk_bins
2 parents 96697bd + 0fa6e20 commit 8c26755

File tree

7 files changed

+7
-5
lines changed

7 files changed

+7
-5
lines changed

build/nuke/Native/Core.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
partial class Build {
3030
[Nuke.Common.Parameter("Build native code")] readonly bool Native;
31+
3132
[Nuke.Common.Parameter("Android home. Will be determined from dotnet if not provided.")] [CanBeNull] string AndroidHomeValue;
3233

3334
static string JobsArg => string.IsNullOrWhiteSpace(GitHubActions.Instance?.Job)

build/nuke/Native/SilkDroid.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ string AndroidHome
106106

107107
// Not expecting this to succeed, but we need to do this so we generate the bindings to go in the public API.
108108
InheritedShell($"dotnet build \"{SourceDirectory / "Windowing" / "Silk.NET.Windowing.Sdl" / "Silk.NET.Windowing.Sdl.csproj"}\"").AssertWaitForExit();
109+
109110

110111
// Update the public API.
111112
InheritedShell(string.Format(FormatDeclCmd, SourceDirectory / "Windowing" / "Silk.NET.Windowing.Sdl" / "Silk.NET.Windowing.Sdl.csproj")).AssertZeroExitCode();

src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="CommandLineParser" Version="2.9.1" />
1717
<PackageReference Include="HtmlAgilityPack" Version="1.12.2" />
1818
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
2020
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.9" />
2121
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
2222
<PackageReference Include="morelinq" Version="4.4.0" />

src/Core/Silk.NET.Core.Tests/Silk.NET.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">

src/Core/Silk.NET.SilkTouch/Silk.NET.SilkTouch.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Compile Include="..\Silk.NET.Core\Attributes\UnmanagedTypeAttribute.cs" />
1919
<Compile Include="..\Silk.NET.Core\Attributes\InjectAttribute.cs" />
2020

21-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
2222
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
2323

2424
<!-- Package the generator in the analyzer directory of the nuget package -->

src/Lab/Experiments/PrototypeStructChaining/PrototypeStructChaining.Test/PrototypeStructChaining.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1515
<PackageReference Include="xunit" Version="2.9.3" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">

src/Vulkan/Silk.NET.Vulkan.Tests/Silk.NET.Vulkan.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
2020
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">

0 commit comments

Comments
 (0)