Movatterモバイル変換

Skip to content

pythonnet/pythonnetPublic

NotificationsYou must be signed in to change notification settings
Fork750
Star5.1k

Commitbae672f

lostmsu

committed

use .NET 6.0 LTS and C# 10

1 parent55abd29 commitbae672fCopy full SHA for bae672f

File tree

9 files changed

+21

-22

lines changed

.github/workflows
- main.yml
- nuget-preview.yml
Directory.Build.props
pythonnet.sln
src
- console
  - Console.csproj
- embed_tests
  - Python.EmbeddingTest.csproj
- runtime
  - Python.Runtime.csproj
- testing
  - Python.Test.csproj
tests
- conftest.py

9 files changed

+21

-22

lines changed

`‎.github/workflows/main.yml`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ jobs:`
`31`	`31`
`32`	`32`	`-name:Setup .NET`
`33`	`33`	`uses:actions/setup-dotnet@v1`
	`34`	`+with:`
	`35`	`+dotnet-version:'6.0.x'`
`34`	`36`
`35`	`37`	`-name:Set up Python ${{ matrix.python }}`
`36`	`38`	`uses:actions/setup-python@v2`

`‎.github/workflows/nuget-preview.yml`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ jobs:`
`25`	`25`
`26`	`26`	`-name:Setup .NET`
`27`	`27`	`uses:actions/setup-dotnet@v1`
	`28`	`+with:`
	`29`	`+dotnet-version:'6.0.x'`
`28`	`30`
`29`	`31`	`-name:Set up Python 3.8`
`30`	`32`	`uses:actions/setup-python@v2`

`‎Directory.Build.props`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`<Project>`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<VersionPrefix>3.0.0</VersionPrefix>`
`4`		`- <AssemblyCopyright>Copyright (c) 2006-2020 The Contributors of the Python.NET Project</AssemblyCopyright>`
	`4`	`+ <AssemblyCopyright>Copyright (c) 2006-2022 The Contributors of the Python.NET Project</AssemblyCopyright>`
`5`	`5`	`<AssemblyCompany>pythonnet</AssemblyCompany>`
`6`	`6`	`<AssemblyProduct>Python.NET</AssemblyProduct>`
`7`		`- <LangVersion>9.0</LangVersion>`
	`7`	`+ <LangVersion>10.0</LangVersion>`
`8`	`8`	`<IsPackable>false</IsPackable>`
`9`	`9`	`</PropertyGroup>`
`10`	`10`	`<ItemGroup>`
`11`	`11`	`<PackageReferenceInclude="Microsoft.CSharp"Version="4.7.0" />`
`12`		`- <PackageReferenceInclude="Microsoft.Net.Compilers.Toolset"Version="3.9.0-3.final">`
	`12`	`+ <PackageReferenceInclude="Microsoft.Net.Compilers.Toolset"Version="4.0.1">`
`13`	`13`	`<PrivateAssets>all</PrivateAssets>`
`14`	`14`	`<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>`
`15`	`15`	`</PackageReference>`

`‎pythonnet.sln`

Lines changed: 9 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`Microsoft Visual Studio Solution File, Format Version 12.00`
`2`		`-# Visual Studio Version16`
`3`		`-VisualStudioVersion =16.0.30717.126`
	`2`	`+# Visual Studio Version17`
	`3`	`+VisualStudioVersion =17.0.31912.275`
`4`	`4`	`MinimumVisualStudioVersion =15.0.26124.0`
`5`	`5`	`Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Python.Runtime","src\runtime\Python.Runtime.csproj","{4E8C8FE2-0FB8-4517-B2D9-5FB2D5FC849B}"`
`6`	`6`	`EndProject`
`@@ -34,6 +34,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution`
`34`	`34`	`setup.py=setup.py`
`35`	`35`	`EndProjectSection`
`36`	`36`	`EndProject`
	`37`	`+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="conda.recipe","conda.recipe","{7FD2404D-0CE8-4645-8DFB-766470E2150E}"`
	`38`	`+ProjectSection(SolutionItems) =preProject`
	`39`	`+conda.recipe\bld.bat=conda.recipe\bld.bat`
	`40`	`+conda.recipe\meta.yaml=conda.recipe\meta.yaml`
	`41`	`+conda.recipe\README.md=conda.recipe\README.md`
	`42`	`+EndProjectSection`
	`43`	`+EndProject`
`37`	`44`	`Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Tools","Tools","{BC426F42-8494-4AA5-82C9-5109ACD97BD1}"`
`38`	`45`	`ProjectSection(SolutionItems) =preProject`
`39`	`46`	`tools\geninterop\geninterop.py=tools\geninterop\geninterop.py`
`@@ -80,18 +87,6 @@ Global`
`80`	`87`	`{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release\|x64.Build.0=Release\|x64`
`81`	`88`	`{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release\|x86.ActiveCfg=Release\|x86`
`82`	`89`	`{E6B01706-00BA-4144-9029-186AC42FBE9A}.Release\|x86.Build.0=Release\|x86`
`83`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|Any CPU.ActiveCfg=Debug\|Any CPU`
`84`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|Any CPU.Build.0=Debug\|Any CPU`
`85`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|x64.ActiveCfg=Debug\|Any CPU`
`86`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|x64.Build.0=Debug\|Any CPU`
`87`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|x86.ActiveCfg=Debug\|Any CPU`
`88`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Debug\|x86.Build.0=Debug\|Any CPU`
`89`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|Any CPU.ActiveCfg=Release\|Any CPU`
`90`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|Any CPU.Build.0=Release\|Any CPU`
`91`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|x64.ActiveCfg=Release\|Any CPU`
`92`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|x64.Build.0=Release\|Any CPU`
`93`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|x86.ActiveCfg=Release\|Any CPU`
`94`		`-{F9F5FA13-BC52-4C0B-BC1C-FE3C0B8FCCDD}.Release\|x86.Build.0=Release\|Any CPU`
`95`	`90`	`{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug\|Any CPU.ActiveCfg=Debug\|Any CPU`
`96`	`91`	`{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug\|Any CPU.Build.0=Debug\|Any CPU`
`97`	`92`	`{819E089B-4770-400E-93C6-4F7A35F0EA12}.Debug\|x64.ActiveCfg=Debug\|Any CPU`

`‎src/console/Console.csproj`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<ProjectSdk="Microsoft.NET.Sdk">`
`2`	`2`	`<PropertyGroup>`
`3`		`- <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>`
	`3`	`+ <TargetFrameworks>net472;net6.0</TargetFrameworks>`
`4`	`4`	`<Platforms>x64;x86</Platforms>`
`5`	`5`	`<OutputType>Exe</OutputType>`
`6`	`6`	`<AssemblyName>nPython</AssemblyName>`

`‎src/embed_tests/Python.EmbeddingTest.csproj`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<ProjectSdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`		`- <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>`
	`4`	`+ <TargetFrameworks>net472;net6.0</TargetFrameworks>`
`5`	`5`	`<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>`
`6`	`6`	`<SignAssembly>true</SignAssembly>`
`7`	`7`	`</PropertyGroup>`

`‎src/runtime/Python.Runtime.csproj`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFrameworks>netstandard2.0</TargetFrameworks>`
`4`	`4`	`<Platforms>AnyCPU</Platforms>`
`5`		`- <LangVersion>9.0</LangVersion>`
	`5`	`+ <LangVersion>10.0</LangVersion>`
`6`	`6`	`<RootNamespace>Python.Runtime</RootNamespace>`
`7`	`7`	`<AssemblyName>Python.Runtime</AssemblyName>`
`8`	`8`

`‎src/testing/Python.Test.csproj`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<ProjectSdk="Microsoft.NET.Sdk">`
`2`	`2`	`<PropertyGroup>`
`3`		`- <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>`
	`3`	`+ <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>`
`4`	`4`	`<AllowUnsafeBlocks>true</AllowUnsafeBlocks>`
`5`	`5`	`<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>`
`6`	`6`	`</PropertyGroup>`

`‎tests/conftest.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def pytest_configure(config):`
`50`	`50`
`51`	`51`	`# tmpdir_factory.mktemp(f"pythonnet-{runtime_opt}")`
`52`	`52`
`53`		`-fw="net5.0"ifruntime_opt=="netcore"else"netstandard2.0"`
	`53`	`+fw="net6.0"ifruntime_opt=="netcore"else"netstandard2.0"`
`54`	`54`
`55`	`55`	`check_call(["dotnet","publish","-f",fw,"-o",bin_path,test_proj_path])`
`56`	`56`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp