Skip to content

Commit be6ad89

Browse files
author
Jake Ginnivan
committed
Revert "Changed White back to .net 35"
This reverts commit 3417bdc.
1 parent ff7d5f6 commit be6ad89

File tree

32 files changed

+104
-97
lines changed

32 files changed

+104
-97
lines changed

‎src/Samples/Todo.Core/Todo.Core.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<FodyPath>..\..\packages\Fody.1.13.12</FodyPath>
17-
<TargetFrameworkProfile />
1817
</PropertyGroup>
1918
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2019
<DebugSymbols>true</DebugSymbols>

‎src/Samples/Wpf/WpfTodo.UITests/WpfTodo.UITests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16-
<TargetFrameworkProfile />
1716
</PropertyGroup>
1817
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
1918
<DebugSymbols>true</DebugSymbols>

‎src/Samples/Wpf/WpfTodo/Properties/Resources.Designer.cs‎

Lines changed: 26 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Samples/Wpf/WpfTodo/Properties/Settings.Designer.cs‎

Lines changed: 14 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Samples/Wpf/WpfTodo/WpfTodo.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
1818
<FodyPath>..\..\..\packages\Fody.1.13.12</FodyPath>
19-
<TargetFrameworkProfile />
2019
</PropertyGroup>
2120
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2221
<DebugSymbols>true</DebugSymbols>

‎src/Samples/Wpf/WpfTodo/app.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0"/>
6+
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0"/>
10+
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
15+
</configuration>

‎src/TestStack.White.Reporting/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
<add key="PublishTestReports" value="false"/>
1313
</Reporting>
1414
</White>
15-
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

‎src/TestStack.White.Reporting/TestStack.White.Reporting.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<OldToolsVersion>3.5</OldToolsVersion>
1818
<UpgradeBackupLocation>
1919
</UpgradeBackupLocation>
20-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2121
<SignAssembly>true</SignAssembly>
2222
<AssemblyOriginatorKeyFile>white.snk</AssemblyOriginatorKeyFile>
2323
<PublishUrl>publish\</PublishUrl>
@@ -62,7 +62,7 @@
6262
<ItemGroup>
6363
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
65+
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
6666
</Reference>
6767
<Reference Include="System" />
6868
<Reference Include="System.Core">

‎src/TestStack.White.Reporting/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
3+
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
44
</packages>

‎src/TestStack.White.ScreenObjects.UITests/TestStack.White.ScreenObjects.UITests.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>TestStack.White.ScreenObjects.UITests</RootNamespace>
1212
<AssemblyName>TestStack.White.ScreenObjects.UITests</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -55,12 +55,13 @@
5555
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="Castle.Core">
59-
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
58+
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
59+
<SpecificVersion>False</SpecificVersion>
60+
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
6061
</Reference>
6162
<Reference Include="NSubstitute, Version=1.6.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
6263
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET35\NSubstitute.dll</HintPath>
64+
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll</HintPath>
6465
</Reference>
6566
<Reference Include="System" />
6667
<Reference Include="System.Core">

0 commit comments

Comments
 (0)