clr-loader: upgrade to .NET 8
This commit is contained in:
@@ -19,31 +19,42 @@ let
|
||||
inherit version;
|
||||
hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4=";
|
||||
};
|
||||
patches = [ ./dotnet-8-upgrade.patch ];
|
||||
|
||||
# This buildDotnetModule is used only to get nuget sources, the actual
|
||||
# build is done in `buildPythonPackage` below.
|
||||
dotnet-build = buildDotnetModule {
|
||||
inherit pname version src;
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
projectFile = [
|
||||
"netfx_loader/ClrLoader.csproj"
|
||||
"example/example.csproj"
|
||||
];
|
||||
nugetDeps = ./deps.json;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version src;
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps;
|
||||
buildInputs = dotnetCorePackages.sdk_8_0.packages ++ dotnet-build.nugetDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
dotnetCorePackages.sdk_6_0
|
||||
dotnetCorePackages.sdk_8_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ cffi ];
|
||||
|
||||
+6
-6
@@ -2,31 +2,31 @@
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "1.1.0",
|
||||
"sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"
|
||||
"hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETFramework.ReferenceAssemblies",
|
||||
"version": "1.0.0",
|
||||
"sha256": "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"
|
||||
"hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net461",
|
||||
"version": "1.0.0",
|
||||
"sha256": "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"
|
||||
"hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETFramework.ReferenceAssemblies.net47",
|
||||
"version": "1.0.0",
|
||||
"sha256": "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6"
|
||||
"hash": "sha256-Jh40dua+AQpSUGTOCQG493sJzbfqH+yIgyoA6+A1ZQM="
|
||||
},
|
||||
{
|
||||
"pname": "NETStandard.Library",
|
||||
"version": "2.0.3",
|
||||
"sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"
|
||||
"hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
|
||||
},
|
||||
{
|
||||
"pname": "NXPorts",
|
||||
"version": "1.0.0",
|
||||
"sha256": "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj"
|
||||
"hash": "sha256-kpqQDljgsCBRDqbuJkgwClG3dkgjrBAhtXoPZlJR+ws="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git a/example/example.csproj b/example/example.csproj
|
||||
index fd6d566..ed76d15 100644
|
||||
--- a/example/example.csproj
|
||||
+++ b/example/example.csproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
- <TargetFrameworks>net60;netstandard20</TargetFrameworks>
|
||||
+ <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
|
||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
diff --git a/tests/test_common.py b/tests/test_common.py
|
||||
index 8a9e36d..8370024 100644
|
||||
--- a/tests/test_common.py
|
||||
+++ b/tests/test_common.py
|
||||
@@ -8,12 +8,12 @@ from pathlib import Path
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def example_netstandard(tmpdir_factory):
|
||||
- return build_example(tmpdir_factory, "netstandard20")
|
||||
+ return build_example(tmpdir_factory, "netstandard2.0")
|
||||
|
||||
|
||||
@pytest.fixture(scope="session")
|
||||
def example_netcore(tmpdir_factory):
|
||||
- return build_example(tmpdir_factory, "net60")
|
||||
+ return build_example(tmpdir_factory, "net8.0")
|
||||
|
||||
|
||||
def build_example(tmpdir_factory, framework):
|
||||
Reference in New Issue
Block a user