Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions DSPythonNet3/DSPythonNet3.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{F1541C2D-80A9-4FE7-8D9E-75A8B9FF3479}</ProjectGuid>
<OutputType>Library</OutputType>
Expand All @@ -14,7 +14,7 @@
<PackageReference Include="DynamoVisualProgramming.Core" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
<PackageReference Include="Python.Included" Version="3.11.6" />
<PackageReference Include="Autodesk.pythonnet" Version="3.1.0-preview*" />
<PackageReference Include="Autodesk.pythonnet" Version="3.1.1-preview*" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
Expand All @@ -41,6 +41,18 @@
<ItemGroup>
<ProjectReference Include="..\DSPythonNet3Wheels\DSPythonNet3Wheels.csproj" />
</ItemGroup>
<!-- Prevent transitive pythonnet from dropping its Python.Runtime.dll while keeping compile assets -->
<ItemGroup>
<PackageReference Update="pythonnet" ExcludeAssets="all" />
</ItemGroup>

<!-- As a safeguard, remove any Python.Runtime coming from NuGet packages from being copied to output -->
<Target Name="RemoveTransitivePythonNetRuntime" AfterTargets="ResolveReferences">
<ItemGroup>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.FileName)' == 'Python.Runtime' and $([System.String]::Copy('%(ReferenceCopyLocalPaths.Identity)').ToLower().Contains('nuget\\packages\\pythonnet'))" />
</ItemGroup>
</Target>

<ItemGroup>
<None Update="pkg.json">
<TargetPath>..\%(Filename)%(Extension)</TargetPath>
Expand Down
2 changes: 1 addition & 1 deletion pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.4.7
version: 1.4.8
pipeline_os: windows
create_pr_release_to_public_master: true

Expand Down
Loading