Update paket / bootstrapper to newest version.

- Added .idea directory to .gitignore (JetBrains Rider)
danm-de · May 8, 2019 · 2a67763 · 2a67763
1 parent 5db195d
commit 2a67763
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -205,3 +205,6 @@ paket-files/*
 
 # Fake temporary files
 .fake
+
+# JetBrains Rider
+.idea/*
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
diff --git a/.paket/paket.exe b/.paket/paket.exe
diff --git a/paket b/paket
@@ -1,17 +1,17 @@
-#!/bin/bash
-
-root=$(dirname "$0")
-dir=$root/.paket
-paket=$dir/paket.exe
-
-maybe_mono=mono
-if [ "$OS" == "Windows_NT" ]; then
-  # Use .NET on Windows
-  maybe_mono=
-fi
-
-$maybe_mono "$paket" $*
-exit_code=$?
-if [ $exit_code -ne 0 ]; then
-  exit $exit_code
-fi
+#!/bin/bash
+
+root=$(dirname "$0")
+dir=$root/.paket
+paket=$dir/paket.exe
+
+maybe_mono=mono
+if [ "$OS" == "Windows_NT" ]; then
+  # Use .NET on Windows
+  maybe_mono=
+fi
+
+$maybe_mono "$paket" $*
+exit_code=$?
+if [ $exit_code -ne 0 ]; then
+  exit $exit_code
+fi
diff --git a/pcsc-sharp.sln.DotSettings b/pcsc-sharp.sln.DotSettings
@@ -44,6 +44,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>