Skip to content

Commit

Permalink
Merge pull request #1736 in ITERATE/cyberduck from feature/MD-8124 to…
Browse files Browse the repository at this point in the history
… master

* commit 'd725d568d5c598194af917b36c2018f715d11685': (31 commits)
  Pass Copyright from property
  Ignore TestNotifyPermutation on CI
  Remove version info from Directory.Build.props
  Test is not reproducible anymore
  Fix for .NET Core 3.0.100-preview7 sdk
  Use .NET 4.7 test runtime
  Move test project build into test target
  Extract CLI build into multiple executions
  Remove old appx package project
  Update Appx package
  Remove duplicate UsesSignTool targets
  Update Appx for x64
  Build x64 installers
  Build x64
  Fix for .NET 4.8
  Reference app.manifest
  Remove dpiawareness
  Include i18n
  Update resources
  Fix settings and resourcesbundle
  ...
  • Loading branch information
dkocher committed Aug 3, 2019
2 parents 078a987 + d725d56 commit 9814b2f
Show file tree
Hide file tree
Showing 60 changed files with 1,431 additions and 1,717 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,13 @@ target
!.idea/copyright
*.iml

# VSCode/Java #
###############
.classpath
.project
.settings
.factorypath

# Compiled source #
###################
*.com
Expand Down Expand Up @@ -41,6 +48,7 @@ Thumbs.db

# .NET stuff #
##############
.vs/
*.suo
*.user
*.sdf
Expand Down
4 changes: 0 additions & 4 deletions App.config
Expand Up @@ -8,10 +8,6 @@
<appSettings>
<add key="ikvm:org.bouncycastle.asn1.allow_unsafe_integer" value="true" />
</appSettings>
<System.Windows.Forms.ApplicationConfigurationSection>
<add key="DpiAwareness" value="false" />
<add key="EnableWindowsFormsHighDpiAutoResizing" value="false" />
</System.Windows.Forms.ApplicationConfigurationSection>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
</startup>
Expand Down
123 changes: 0 additions & 123 deletions Cyberduck Bonjour.csproj

This file was deleted.

163 changes: 0 additions & 163 deletions Cyberduck CLI.csproj

This file was deleted.

0 comments on commit 9814b2f

Please sign in to comment.