Skip to content

Commit

Permalink
upgrade to .net framework 4.6.1 + dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kbilsted committed Jan 19, 2019
1 parent f6f65ee commit 768cc8c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
4 changes: 2 additions & 2 deletions StatePrinter.Tests/Settings.StyleCop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<StyleCopSettings Version="105">
<GlobalSettings>
<StringProperty Name="MergeSettingsFiles">Parent</StringProperty>
<BooleanProperty Name="ViolationsAsErrors">True</BooleanProperty>
<StringProperty Name="LinkedSettingsFile"></StringProperty>
<StringProperty Name="MergeSettingsFiles">Linked</StringProperty>
</GlobalSettings>
</StyleCopSettings>
15 changes: 12 additions & 3 deletions StatePrinter.Tests/StatePrinter.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>StatePrinting.Tests</RootNamespace>
<AssemblyName>StatePrinter.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<StyleCopOverrideSettingsFile>Settings.StyleCop</StyleCopOverrideSettingsFile>
<BuildToolsStyleCopVersion>4.7.44.0</BuildToolsStyleCopVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -29,19 +31,22 @@
<Prefer32Bit>false</Prefer32Bit>
<CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
<NoWarn>612 618</NoWarn>
<StyleCopEnabled>False</StyleCopEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<StyleCopEnabled>True</StyleCopEnabled>
<StyleCopTreatErrorsAsWarnings>False</StyleCopTreatErrorsAsWarnings>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.11.0\lib\net35\nunit.framework.dll</HintPath>
<HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -111,6 +116,10 @@
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
</Target>
<Import Project="..\packages\BuildTools.StyleCop.4.7.49.0\tools\StyleCop.targets" Condition="Exists('..\packages\BuildTools.StyleCop.4.7.49.0\tools\StyleCop.targets')" />
<Target Name="___packages_BuildTools_StyleCop_4_7_49_0_tools_StyleCop_targets" Condition="$(StyleCopOutputFile)==''" BeforeTargets="BeforeBuild">
<Error Text="BuildTools_StyleCop - the BuildTools_StyleCop package has not been restored.&#xD;&#xA;If you are running this from an IDE, make sure NuGet Package Restore has been enabled, then reload the solution and re-run the build.&#xD;&#xA;If you are running this from the command line, run the build again.&#xD;&#xA;If this is a CI server, you may want to make sure NuGet Package Restore runs before your build with:&#xD;&#xA; msbuild solution.sln /t:restorepackages" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
22 changes: 11 additions & 11 deletions StatePrinter.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BuildTools.StyleCop" version="4.7.49.0" targetFramework="net35" />
<package id="coveralls.io" version="1.1.86" />
<package id="NUnit" version="3.11.0" targetFramework="net35" />
<package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net35" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net35" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net35" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net35" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.3" targetFramework="net35" />
<package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net35" />
<package id="NUnit.Runners" version="3.9.0" targetFramework="net35" />
<package id="OpenCover" version="4.5.3522" />
<package id="BuildTools.StyleCop" version="4.7.49.0" targetFramework="net461" />
<package id="coveralls.io" version="1.1.86" targetFramework="net461" />
<package id="NUnit" version="3.11.0" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.3" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net461" />
<package id="NUnit.Runners" version="3.9.0" targetFramework="net461" />
<package id="OpenCover" version="4.6.519" targetFramework="net461" />
</packages>
4 changes: 3 additions & 1 deletion StatePrinter/StatePrinter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>StatePrinting</RootNamespace>
<AssemblyName>StatePrinter</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
Expand All @@ -28,6 +28,7 @@
<CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -37,6 +38,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>gfx\stateprinter.ico</ApplicationIcon>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:


after_test:
- packages\OpenCover.4.5.3522\OpenCover.Console.exe -register:user -filter:"+[StatePrinter]*" -target:"packages\NUnit.Runners.2.6.4\tools\nunit-console.exe" -targetargs:"StatePrinter.Tests\bin\debug\StatePrinter.Tests.dll /domain:single /noshadow" -output:"coverage.xml"
- packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -filter:"+[StatePrinter]*" -target:"packages\NUnit.ConsoleRunner.3.9.0\tools\nunit3-console.exe" -targetargs:"StatePrinter.Tests\bin\debug\StatePrinter.Tests.dll /domain:single" -output:"coverage.xml"

- packages\coveralls.io.1.1.86\tools\coveralls.net.exe --opencover "coverage.xml"

0 comments on commit 768cc8c

Please sign in to comment.