Skip to content

Commit

Permalink
Revert "Changed White back to .net 35"
Browse files Browse the repository at this point in the history
This reverts commit 3417bdc.
Jake Ginnivan committed Jan 21, 2014

Verified

This commit was signed with the committer’s verified signature.
lukeshay Luke Shay
1 parent ff7d5f6 commit be6ad89
Showing 32 changed files with 104 additions and 97 deletions.
1 change: 0 additions & 1 deletion src/Samples/Todo.Core/Todo.Core.csproj
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<FodyPath>..\..\packages\Fody.1.13.12</FodyPath>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
1 change: 0 additions & 1 deletion src/Samples/Wpf/WpfTodo.UITests/WpfTodo.UITests.csproj
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
44 changes: 26 additions & 18 deletions src/Samples/Wpf/WpfTodo/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions src/Samples/Wpf/WpfTodo/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/Samples/Wpf/WpfTodo/WpfTodo.csproj
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<FodyPath>..\..\..\packages\Fody.1.13.12</FodyPath>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
12 changes: 6 additions & 6 deletions src/Samples/Wpf/WpfTodo/app.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0"/>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0"/>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
</configuration>
2 changes: 1 addition & 1 deletion src/TestStack.White.Reporting/App.config
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@
<add key="PublishTestReports" value="false"/>
</Reporting>
</White>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>white.snk</AssemblyOriginatorKeyFile>
<PublishUrl>publish\</PublishUrl>
@@ -62,7 +62,7 @@
<ItemGroup>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
2 changes: 1 addition & 1 deletion src/TestStack.White.Reporting/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestStack.White.ScreenObjects.UITests</RootNamespace>
<AssemblyName>TestStack.White.ScreenObjects.UITests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -55,12 +55,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="NSubstitute, Version=1.6.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET35\NSubstitute.dll</HintPath>
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
6 changes: 3 additions & 3 deletions src/TestStack.White.ScreenObjects.UITests/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="NSubstitute" version="1.6.1.0" targetFramework="net35" />
<package id="xunit" version="1.9.1" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
<package id="NSubstitute" version="1.6.1.0" targetFramework="net40" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion src/TestStack.White.ScreenObjects/App.config
Original file line number Diff line number Diff line change
@@ -22,4 +22,4 @@
<add key="LogCoreActions" value="false"/>
</Core>
</White>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>white.snk</AssemblyOriginatorKeyFile>
<PublishUrl>publish\</PublishUrl>
@@ -60,7 +60,7 @@
<ItemGroup>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
2 changes: 1 addition & 1 deletion src/TestStack.White.ScreenObjects/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion src/TestStack.White.UITests/App.config
Original file line number Diff line number Diff line change
@@ -11,4 +11,4 @@
<add key="BusyTimeout" value="10000"/>
</Core>
</White>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
8 changes: 4 additions & 4 deletions src/TestStack.White.UITests/TestStack.White.UITests.csproj
Original file line number Diff line number Diff line change
@@ -9,11 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestStack.White.UITests</RootNamespace>
<AssemblyName>TestStack.White.UITests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
@@ -40,8 +39,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="System" />
4 changes: 2 additions & 2 deletions src/TestStack.White.UITests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="xunit" version="1.9.1" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion src/TestStack.White.UnitTests/App.config
Original file line number Diff line number Diff line change
@@ -34,4 +34,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
2 changes: 1 addition & 1 deletion src/TestStack.White.UnitTests/CoreProjectTest.cs
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ public void AllUIItemsHaveDefaultConstructor()
AllSubsclassesHaveEmptyConstructor(collection, typeof(SearchCriteria));
AllSubsclassesHaveEmptyConstructor(collection, typeof(AutomationElementProperty));
if (collection.Any())
throw new Exception(string.Join("\r\n", collection.ToArray()));
throw new Exception(string.Join("\r\n", collection));
}

private void AllSubsclassesHaveEmptyConstructor(List<string> collection, Type type)
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestStack.White.UnitTests</RootNamespace>
<AssemblyName>TestStack.White.UnitTests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
</StartupObject>
@@ -59,12 +59,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="NSubstitute, Version=1.6.1.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET35\NSubstitute.dll</HintPath>
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
6 changes: 3 additions & 3 deletions src/TestStack.White.UnitTests/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="NSubstitute" version="1.6.1.0" targetFramework="net35" />
<package id="xunit" version="1.9.1" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
<package id="NSubstitute" version="1.6.1.0" targetFramework="net40" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TestStack.White.WebBrowser.UITests</RootNamespace>
<AssemblyName>TestStack.White.WebBrowser.UITests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>
@@ -58,8 +58,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\packages\Castle.Core.3.2.2\lib\net35\Castle.Core.dll</HintPath>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
4 changes: 2 additions & 2 deletions src/TestStack.White.WebBrowser.UITests/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.2.2" targetFramework="net35" />
<package id="xunit" version="1.9.1" targetFramework="net35" />
<package id="Castle.Core" version="3.2.2" targetFramework="net40" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
</packages>
Loading

0 comments on commit be6ad89

Please sign in to comment.