Skip to content

Commit 1da679f

Browse files
committed
Fix failing CI
1 parent 2293dca commit 1da679f

6 files changed

+14
-6
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<!-- Set this property to false if you don't want to use the runtime
1414
framework version defined in Versions.props -->
15-
<UseCustomRuntimeVersion>false</UseCustomRuntimeVersion>
15+
<UseCustomRuntimeVersion>true</UseCustomRuntimeVersion>
1616
<RuntimeFrameworkVersion Condition="$(UseCustomRuntimeVersion)">$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
1717
</PropertyGroup>
1818

src/SwiftBindings/SwiftBindings.sln SwiftBindings.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26124.0
55
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings", "src\SwiftBindings.csproj", "{B7977360-6671-4707-9A1C-1C29D5BE2674}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings", "src\SwiftBindings\src\SwiftBindings.csproj", "{B7977360-6671-4707-9A1C-1C29D5BE2674}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings.Tests", "tests\SwiftBindings.Tests.csproj", "{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings.Tests", "src\SwiftBindings\tests\SwiftBindings.Tests.csproj", "{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution

eng/Version.Details.xml

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4+
<ProductDependencies>
5+
<!-- This VS redist package is used as a way to get a non-shipping version number
6+
when using a custom runtime version. -->
7+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.5.21226.5">
8+
<Uri>https://github.com/dotnet/runtime</Uri>
9+
<Sha>ac82799250fe42c8ba2941aef487aca94ecf04cc</Sha>
10+
</Dependency>
11+
</ProductDependencies>
412
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24165.6">
513
<Uri>https://github.com/dotnet/arcade</Uri>
614
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<XUnitVersion>2.4.1</XUnitVersion>
1717
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
1818
<!-- Set the custom NETCoreApp version -->
19-
<MicrosoftNETCoreAppVersion>7.0.0-preview.7.22375.6</MicrosoftNETCoreAppVersion>
19+
<MicrosoftNETCoreAppVersion>9.0.0-preview.2.24128.5</MicrosoftNETCoreAppVersion>
2020
</PropertyGroup>
2121
</Project>

src/SwiftBindings/src/SwiftBindings.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

src/SwiftBindings/tests/SwiftBindings.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

0 commit comments

Comments
 (0)