Skip to content

Commit 41279ee

Browse files
committed
Fixed compilation issues
1 parent a71e71e commit 41279ee

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ ConventionTests*.nupkg
1515
_NCrunch*
1616
*.received.txt
1717
*.orig
18-
packages
18+
packages
19+
ConventionTests.sln.ide/

ConventionTests.sln.DotSettings

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MQ/@EntryIndexedValue">MQ</s:String>
1111
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
1212
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
13-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
13+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
14+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

TestStack.ConventionTests/TestStack.ConventionTests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,10 @@
5959
<Reference Include="System.Xml" />
6060
</ItemGroup>
6161
<ItemGroup>
62-
<Compile Include="ConventionData\TypeExtensions.cs" />
6362
<Compile Include="ConventionFailedException.cs" />
6463
<Compile Include="ConventionData\ProjectPropertyGroup.cs" />
6564
<Compile Include="ConventionData\ProjectPropertyGroups.cs" />
6665
<Compile Include="ConventionData\TypeExtensions.cs" />
67-
<Compile Include="ConventionFailedException.cs" />
6866
<Compile Include="Conventions\ConfigurationHasSpecificValue.cs" />
6967
<Compile Include="Conventions\ViewModelShouldInheritFromINotifyPropertyChanged.cs" />
7068
<Compile Include="ConventionReporterAttribute.cs" />

0 commit comments

Comments
 (0)