Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi target framework test #12716

Closed
wants to merge 8 commits into from
Closed

Multi target framework test #12716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a104516
update
pinzart Mar 18, 2022
83df8ae
update
pinzart Mar 18, 2022
33d5e67
update
pinzart Mar 18, 2022
30bf9d4
update
pinzart Mar 18, 2022
04f1013
update
pinzart Mar 18, 2022
4fb44e0
update
pinzart Mar 20, 2022
6705ad4
update
pinzart Mar 20, 2022
c4e7479
update
pinzart Mar 23, 2022
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
Binary file modified extern/Python/Python.Included.dll
View file
Open in desktop
Binary file not shown.
Binary file modified extern/Python/Python.Runtime.dll
View file
Open in desktop
Binary file not shown.
52 changes: 46 additions & 6 deletions src/Config/CS_SDK.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<Project>
<PropertyGroup>
<Platforms>NET48_ANYCPU;NET50_ANYCPU</Platforms>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<Platform Condition=" '$(Platform)' == '' ">NET48_ANYCPU</Platform>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
<TargetFramework>net48</TargetFramework>
<FileAlignment>512</FileAlignment>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<OutputPath Condition=" '$(OutputPath)' == '' ">$(SolutionDir)..\bin\AnyCPU\$(Configuration)</OutputPath>
<BaseIntermediateOutputPath>int\</BaseIntermediateOutputPath>
<OutputPath Condition=" '$(OutputPath)' == '' ">$(SolutionDir)..\bin\$(Platform)\$(Configuration)</OutputPath>
<NunitPath Condition=" '$(NunitPath)' == '' ">$(SolutionDir)..\extern\NUnit</NunitPath>
<SharpDXDirectXVersion>DirectX11</SharpDXDirectXVersion>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<UICulture>en-US</UICulture>
<PlatformTarget>AnyCPU</PlatformTarget>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<TestProjectDefaults Condition="$(MSBuildProjectDirectory.Contains('test'))">true</TestProjectDefaults>
<TestProjectDefaults Condition=" '$(TestProjectDefaults)' == '' ">false</TestProjectDefaults>
<NoWarn>MSB3539</NoWarn><!--The value of the property "BaseIntermediateOutputPath" was modified after it was used by MSBuild-->
<!--This is used to set the framework version for icon resource dll generation (lookup of system.drawing.dll)-->
<ResourceGeneration_FrameworkVersion>v4.8</ResourceGeneration_FrameworkVersion>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
<DebugSymbols>true</DebugSymbols>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<UseAppHost>false</UseAppHost>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DebugType>full</DebugType>
Expand All @@ -34,11 +35,37 @@
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('NET48'))">
<TargetFramework>net48</TargetFramework>
<TargetFrameworkId>net48</TargetFrameworkId>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('NET60'))" >
<TargetFramework>net60</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="$(Platform.Contains('NET50'))" >
<TargetFramework>net50</TargetFramework>
<TargetFrameworkId>net50orAbove</TargetFrameworkId>
</PropertyGroup>
<PropertyGroup Condition="'$(UILib)' == 'true' AND $(Platform.Contains('NET50'))">
<TargetFramework>net50-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<PropertyGroup>
<BaseIntermediateOutputPath>int\$(TargetFramework)\</BaseIntermediateOutputPath>
<IntermediateOutputPath>obj\$(TargetFramework)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworkId)' == 'net50orAbove'">
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
<ItemGroup>
<Compile Remove="obj\**" />
<EmbeddedResource Remove="obj\**" />
<None Remove="obj\**" />
<None Remove="*.resources" />
<Compile Remove="int\**" />
<EmbeddedResource Remove="int\**" />
<None Remove="int\**" />
</ItemGroup>
<ItemGroup>
<Compile Condition="'$(ProjectName)'!='AssemblyInfoGenerator'" Include="$(SolutionDir)AssemblySharedInfoGenerator\AssemblySharedInfo.cs">
Expand Down Expand Up @@ -88,4 +115,17 @@
<Copy SourceFiles="@(PDBContent)" DestinationFolder="$(OutDir)$(PackagesOutputSubdirectory)" Condition="Exists('%(FullPath)')" />
<Copy SourceFiles="@(DLLContent)" DestinationFolder="$(OutDir)$(PackagesOutputSubdirectory)$(Local_CopyToSubdirectory)" Condition="Exists('%(FullPath)')" />
</Target>
<Target Name="ResolveSateliteResDeps" AfterTargets="Build" Condition=" '$(OS)' != 'Unix' ">
<!-- Get System.Drawing.dll -->
<PropertyGroup Condition=" '$(TargetFramework)' == 'net48' ">
<ResourceGeneration_FrameworkVersion >v4.8</ResourceGeneration_FrameworkVersion>
</PropertyGroup>
<GetReferenceAssemblyPaths Condition=" '$(TargetFramework)' == 'net48' " TargetFrameworkMoniker=".NETFramework, Version=$(ResourceGeneration_FrameworkVersion)">
<Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="FrameworkAssembliesPath" />
</GetReferenceAssemblyPaths>
<PropertyGroup>
<SystemDrawingDllPath Condition=" '$(TargetFramework)' == 'net48' ">$(FrameworkAssembliesPath)System.Drawing.dll</SystemDrawingDllPath>
<SystemDrawingDllPath Condition=" '$(TargetFramework)' == 'net50' ">$(PkgSystem_Drawing_Common)\lib\netcoreapp3.1\System.Drawing.Common.dll</SystemDrawingDllPath>
</PropertyGroup>
</Target>
</Project>
14 changes: 10 additions & 4 deletions src/DocumentationBrowserViewExtension/DocumentationBrowserViewExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UILib>true</UILib>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)Config\CS_SDK.props" />
</ImportGroup>
Expand All @@ -8,11 +11,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Dynamo.DocumentationBrowser</RootNamespace>
<AssemblyName>DocumentationBrowserViewExtension</AssemblyName>
<EnableDefaultPageItems>False</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.Prism">
<HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
</Reference>
<ItemGroup Condition=" '$(TargetFrameworkId)' == 'net48' ">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Design" />
Expand All @@ -22,6 +23,11 @@
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.Prism">
<HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DynamoCoreWpf\DynamoCoreWpf.csproj">
<Project>{51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4}</Project>
Expand Down
Loading