Skip to content

Commit

Permalink
Fix MEF2 assembly references
Browse files Browse the repository at this point in the history 
Fix CodeAnalysis ruleset for Tests assembly
  • Loading branch information
@viciousviper
viciousviper committed Dec 31, 2015
1 parent cc03b78 commit fe3ea0e
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DokanCloudFS.Tests/DokanCloudFS.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>..\..\CloudFileTools\include\TestAssemblies.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet>..\TestAssemblies.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand Down
1 change: 1 addition & 0 deletions DokanCloudFS.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
DokanCloudFS.runsettings = DokanCloudFS.runsettings
LICENSE.md = LICENSE.md
README.md = README.md
TestAssemblies.ruleset = TestAssemblies.ruleset
EndProjectSection
EndProject
Global
Expand Down
20 changes: 12 additions & 8 deletions DokanCloudFS/DokanCloudFS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,21 @@
<HintPath>..\Library\SharpAESCrypt.exe</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Composition.AttributedModel">
<HintPath>..\..\PowerShellCloudProvider\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
<Reference Include="System.Composition.AttributedModel, Version=1.0.30.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Composition.Hosting">
<HintPath>..\..\PowerShellCloudProvider\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
<Reference Include="System.Composition.Hosting, Version=1.0.30.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Composition.Runtime">
<HintPath>..\..\PowerShellCloudProvider\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
<Reference Include="System.Composition.Runtime, Version=1.0.30.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Composition.TypedParts">
<HintPath>..\..\PowerShellCloudProvider\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
<Reference Include="System.Composition.TypedParts, Version=1.0.30.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Composition.1.0.30\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
Expand Down
1 change: 1 addition & 0 deletions DokanCloudFS/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DokanNet" version="1.0.8.0" targetFramework="net46" />
<package id="Microsoft.Composition" version="1.0.30" targetFramework="net46" />
<package id="NLog" version="4.3.0-alpha3" targetFramework="net46" />
<package id="SemanticTypes" version="0.12.0" targetFramework="net46" />
</packages>
13 changes: 13 additions & 0 deletions TestAssemblies.ruleset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="IgorSoft TestAssemblies" Description="Dieser Regelsatz enthält alle Regeln. Das Ausführen dieses Regelsatzes führt möglicherweise zu einer hohen Anzahl gemeldeter Warnungen. Verwenden Sie diesen Regelsatz, um einen Überblick über alle Probleme in Ihrem Code zu erhalten. Dies kann Ihnen bei der Entscheidung behilflich sein, welche der spezifischeren Regelsätze für Ihre Projekte am besten geeignet sind." ToolsVersion="14.0">
<IncludeAll Action="Warning" />
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="CA1305" Action="None" />
<Rule Id="CA1506" Action="None" />
<Rule Id="CA1703" Action="None" />
<Rule Id="CA1707" Action="None" />
<Rule Id="CA1806" Action="None" />
<Rule Id="CA1811" Action="None" />
<Rule Id="CA2000" Action="None" />
</Rules>
</RuleSet>

1 comment on commit fe3ea0e

@viciousviper
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should fix #1.

Please sign in to comment.