Skip to content

Commit 6308a4f

Browse files
AliveDevilAliveDevil
committed
Progress towards less house-keeping in projects
1 parent 2337ef3 commit 6308a4f

18 files changed

+365
-15
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ insert_final_newline = true
1212
charset = utf-8-bom
1313

1414
# XML project files
15-
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,msbuildproj}]
15+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj}]
1616
indent_size = 2
1717

1818
# XML config files

‎src/main/msbuild/Cyberduck.Artifacts.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project>
2+
3+
<PropertyGroup Condition="'$(Platforms)'==''">
4+
<OutputPath>$(BaseOutputPath)</OutputPath>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<OutputPath Condition="'$(OutputPath)'=='' And '$(Platform)'=='AnyCPU'">$(BaseOutputPath)</OutputPath>
9+
<OutputPath Condition="'$(OutputPath)'=='' And '$(Platform)'!='AnyCPU'">$(BaseOutputPath)$(Platform)\</OutputPath>
10+
</PropertyGroup>
11+
12+
</Project>

‎src/main/msbuild/Cyberduck.Common.props‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
3+
<PropertyGroup Label="AssemblyInfo">
4+
<Company>iterate GmbH</Company>
5+
<Description>Libre FTP, SFTP, WebDAV, S3 and OpenStack Swift browser for Mac and Windows.</Description>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<TargetBuildDir>$(ModulePath)target\</TargetBuildDir>
10+
<LibDir>$(TargetBuildDir)lib\</LibDir>
11+
<GeneratedMSBuildDir>$(TargetBuildDir)generated\msbuild\</GeneratedMSBuildDir>
12+
13+
<UseArtifactsOutput>false</UseArtifactsOutput>
14+
<ArtifactsPath>$(TargetBuildDir)</ArtifactsPath>
15+
16+
<BaseIntermediateOutputPath>$(ArtifactsPath)obj\$(projectName)\</BaseIntermediateOutputPath>
17+
<BaseOutputPath>$(ArtifactsPath)</BaseOutputPath>
18+
19+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
20+
<LangVersion>12</LangVersion>
21+
22+
<RestoreAdditionalProjectFallbackFolders Condition="Exists('$(TargetBuildDir).nuget\packages\')">$(TargetBuildDir).nuget\packages\;$(RestoreAdditionalProjectFallbackFolders)</RestoreAdditionalProjectFallbackFolders>
23+
</PropertyGroup>
24+
25+
<ItemDefinitionGroup>
26+
<CyberduckReference>
27+
<ProjectPath />
28+
</CyberduckReference>
29+
</ItemDefinitionGroup>
30+
31+
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
32+
33+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
34+
<SignOutput Condition=" '$(SignOutput)' == '' ">false</SignOutput>
35+
</PropertyGroup>
36+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
37+
<SignOutput Condition=" '$(SignOutput)' == '' ">true</SignOutput>
38+
</PropertyGroup>
39+
40+
</Project>

‎src/main/msbuild/Cyberduck.Common.targets‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
3+
<Import Project="Cyberduck.References.props" />
4+
5+
<ItemGroup>
6+
<ProjectReference Include="@(AutoProjectReference)" SetPlatform="Platform=" />
7+
</ItemGroup>
8+
9+
<Target Name="UsesSignTool" Outputs="$(SignTool);$(SignToolPath)">
10+
<ItemGroup>
11+
<SignToolPath Include="$(WindowsSDK_ExecutablePath)" />
12+
</ItemGroup>
13+
<PropertyGroup>
14+
<SignTool>SignTool.exe sign /d "$(AppName)" /fd sha256 /tr http://timestamp.entrust.net/TSS/RFC3161sha2TS /td sha256 /a /sm /n "iterate GmbH"</SignTool>
15+
<SignToolPath>PATH=@(SignToolPath, '%3B')</SignToolPath>
16+
</PropertyGroup>
17+
</Target>
18+
19+
<Import Project="Cyberduck.NuGet.targets" />
20+
21+
</Project>

‎src/main/msbuild/Cyberduck.Cpp.props‎

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

‎src/main/msbuild/Cyberduck.Default.props‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
~ Copyright (c) 2002-2019 iterate GmbH. All rights reserved.
3+
~ https://cyberduck.io/
4+
~
5+
~ This program is free software; you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
-->
15+
16+
<Project>
17+
18+
<Import Project="Cyberduck.Common.props" />
19+
<Import Project="Cyberduck.Net.props" Condition="'$(UsingMicrosoftNETSdk)'=='True'" />
20+
21+
<!-- If DefaultLanguageSourceExtension != '' -->
22+
<Import Project="Cyberduck$(DefaultLanguageSourceExtension).props" Condition="'$(DefaultLanguageSourceExtension)'!='' And Exists('Cyberduck$(DefaultLanguageSourceExtension).props')" />
23+
<!-- Else -->
24+
<Import Project="Cyberduck$(MSBuildProjectExtension).props" Condition="'$(DefaultLanguageSourceExtension)'=='' And Exists('Cyberduck$(MSBuildProjectExtension).props')" />
25+
26+
</Project>

‎src/main/msbuild/Cyberduck.Default.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<!--
2+
~ Copyright (c) 2002-2019 iterate GmbH. All rights reserved.
3+
~ https://cyberduck.io/
4+
~
5+
~ This program is free software; you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
-->
15+
16+
<Project>
17+
18+
<Import Project="Cyberduck.Common.targets" />
19+
<Import Project="Cyberduck.Net.targets" Condition="'$(UsingMicrosoftNETSdk)'=='True'" />
20+
21+
<!-- If DefaultLanguageSourceExtension != '' -->
22+
<Import Project="Cyberduck$(DefaultLanguageSourceExtension).targets" Condition="'$(DefaultLanguageSourceExtension)'!='' And Exists('Cyberduck$(DefaultLanguageSourceExtension).targets')" />
23+
<!-- Else -->
24+
<Import Project="Cyberduck$(MSBuildProjectExtension).targets" Condition="'$(DefaultLanguageSourceExtension)'=='' And Exists('Cyberduck$(MSBuildProjectExtension).targets')" />
25+
26+
</Project>

‎src/main/msbuild/Cyberduck.Java.props‎

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

‎src/main/msbuild/Cyberduck.Net.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<BeforeMicrosoftNETSdkTargets>$(BuildSupportDir)Cyberduck.Artifacts.targets</BeforeMicrosoftNETSdkTargets>
5+
</PropertyGroup>
6+
7+
<Import Project="Microsoft.WindowsSdk.props" />
8+
9+
<PropertyGroup Condition=" '$(TargetFramework)' != 'net472' ">
10+
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net472*</DefaultItemExcludes>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
13+
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net8.0*</DefaultItemExcludes>
14+
</PropertyGroup>
15+
16+
</Project>

‎src/main/msbuild/Cyberduck.Net.targets‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<AssemblySearchPaths>$(LibDir);$(AssemblySearchPaths)</AssemblySearchPaths>
5+
</PropertyGroup>
6+
7+
<PropertyGroup Condition=" '$(TargetFramework)' != '' ">
8+
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472'))">net472</LibDirFramework>
9+
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">net8.0</LibDirFramework>
10+
</PropertyGroup>
11+
<PropertyGroup Condition="'$(LibDirFramework)'!=''">
12+
<AssemblySearchPaths>$(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths)</AssemblySearchPaths>
13+
<AssemblySearchPaths Condition="!('$(Platform)'=='' or '$(Platform)'=='AnyCPU')">$(LibDir)$(LibDirFramework)\$(Platform)\;$(AssemblySearchpaths)</AssemblySearchPaths>
14+
</PropertyGroup>
15+
16+
<PropertyGroup>
17+
<!-- Fix .NET 8 Sdk RuntimeIdentifiers to align with .NET 9 Sdk -->
18+
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x86'">win-x86</RuntimeIdentifier>
19+
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x64'">win-x64</RuntimeIdentifier>
20+
</PropertyGroup>
21+
22+
<Target Name="SignAppHost" BeforeTargets="Compile" DependsOnTargets="_CreateAppHost;UsesSignTool" Inputs="$(AppHostIntermediatePath)" Outputs="$(AppHostIntermediatePath)" Condition="'$(AppHostIntermediatePath)'!='' And '$(SignOutput)'=='true'">
23+
<ItemGroup>
24+
<SignToolPath Include="$(WindowsSDK_ExecutablePath)" />
25+
</ItemGroup>
26+
<PropertyGroup>
27+
<SignTool>SignTool.exe sign /d "$(AppName)" /fd sha256 /tr http://timestamp.entrust.net/TSS/RFC3161sha2TS /td sha256 /a /sm /n "iterate GmbH"</SignTool>
28+
<SignToolPath>PATH=@(SignToolPath, '%3B')</SignToolPath>
29+
</PropertyGroup>
30+
<Exec Command="$(SignTool) &quot;$(AppHostIntermediatePath)&quot;" EnvironmentVariables="$(SignToolPath)" />
31+
</Target>
32+
33+
<PropertyGroup Condition=" '$(NETCoreSdkVersion)'!='' ">
34+
<!-- Treat SDK 6.0.301 as last known to work. -->
35+
<NETSDKBeforeFeature>$([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301'))</NETSDKBeforeFeature>
36+
<NETSDKAfterFix>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401'))</NETSDKAfterFix>
37+
<CoreCompileDependsOn Condition="!($(NETSDKBeforeFeature) or $(NETSDKAfterFix))">SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn)</CoreCompileDependsOn>
38+
</PropertyGroup>
39+
40+
<Target Name="SDKFix_RemoveDuplicateAnalyzers">
41+
<ItemGroup>
42+
<FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
43+
<Analyzer Remove="@(Analyzer)" />
44+
<Analyzer Include="@(FilteredAnalyzer)" />
45+
<FilteredAnalyzer Remove="@(FilteredAnalyzer)" />
46+
</ItemGroup>
47+
</Target>
48+
49+
</Project>

0 commit comments

Comments
 (0)