Visitar URL original
Merge branch 'master' into freethreading-prep · pythonnet/pythonnet@7903934 · GitHub
Skip to content

Commit 7903934

Browse files
filmorfilmor
authored
Merge branch 'master' into freethreading-prep
2 parents d1b4daa + 107e9a5 commit 7903934

7 files changed

Lines changed: 469 additions & 530 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v6
9+
- uses: actions/checkout@v7
1010
- name: Set up Python
1111
uses: astral-sh/setup-uv@v7
1212
with:

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
8383
steps:
8484
- name: Checkout code
85-
uses: actions/checkout@v6
85+
uses: actions/checkout@v7
8686

8787
# Use main until support for architecture lands
8888
- name: Setup .NET

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
echo "DATE_VER=$(date "+%Y-%m-%d")" >> $GITHUB_ENV
2222
2323
- name: Checkout code
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525

2626
- name: Setup .NET
27-
uses: actions/setup-dotnet@v5
27+
uses: actions/setup-dotnet@v6
2828
with:
2929
dotnet-version: '6.0.x'
3030

3131
- name: Set up Python 3.8
32-
uses: actions/setup-python@v6
32+
uses: actions/setup-python@v7
3333
with:
3434
python-version: 3.8
3535
architecture: x64

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ prune src/runtime/bin
44
graft src/compat
55
include src/pythonnet.snk
66
include Directory.Build.*
7-
include pythonnet.sln
7+
include pythonnet.slnx
88
include version.txt

‎pythonnet.sln‎

Lines changed: 0 additions & 194 deletions
This file was deleted.

‎pythonnet.slnx‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Solution>
2+
<Configurations>
3+
<BuildType Name="Debug" />
4+
<BuildType Name="Release" />
5+
<BuildType Name="TraceAlloc" />
6+
<Platform Name="Any CPU" />
7+
<Platform Name="x64" />
8+
<Platform Name="x86" />
9+
</Configurations>
10+
<Folder Name="/Build/">
11+
<File Path="Directory.Build.props" />
12+
</Folder>
13+
<Folder Name="/CI/">
14+
<File Path=".github/workflows/ARM.yml" />
15+
<File Path=".github/workflows/main.yml" />
16+
<File Path=".github/workflows/nuget-preview.yml" />
17+
</Folder>
18+
<Folder Name="/Repo/">
19+
<File Path=".editorconfig" />
20+
<File Path=".gitignore" />
21+
<File Path="CHANGELOG.md" />
22+
<File Path="LICENSE" />
23+
<File Path="README.rst" />
24+
<File Path="shell.nix" />
25+
<File Path="version.txt" />
26+
</Folder>
27+
<Folder Name="/Solution Items/">
28+
<File Path="setup.py" />
29+
</Folder>
30+
<Folder Name="/Tools/">
31+
<File Path="tools/geninterop/geninterop.py" />
32+
</Folder>
33+
<Project Path="src/embed_tests/Python.EmbeddingTest.csproj">
34+
<BuildType Solution="TraceAlloc|*" Project="Debug" />
35+
</Project>
36+
<Project Path="src/python_tests_runner/Python.PythonTestsRunner.csproj">
37+
<BuildType Solution="TraceAlloc|*" Project="Debug" />
38+
</Project>
39+
<Project Path="src/runtime/Python.Runtime.csproj">
40+
<BuildType Solution="TraceAlloc|x64" Project="Debug" />
41+
<BuildType Solution="TraceAlloc|x86" Project="Debug" />
42+
</Project>
43+
<Project Path="src/testing/Python.Test.csproj">
44+
<BuildType Solution="TraceAlloc|*" Project="Debug" />
45+
</Project>
46+
<Project Path="tests/domain_tests/Python.DomainReloadTests.csproj">
47+
<BuildType Solution="TraceAlloc|*" Project="Debug" />
48+
</Project>
49+
</Solution>

0 commit comments

Comments
 (0)