Commits

Christian Junk  committed 7cc9892

applied patch 8466 from manderson to support VS2010

  • Participants
  • Parent commits 416cfcb

Comments (0)

Files changed (14)

File src/AcceptanceTests/AcceptanceTests.csproj

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.21022</ProductVersion>
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>

File src/Core/Core.csproj

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.21022</ProductVersion>
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <None Include="Resources\Templates\2008\SaplingConsole.csproj.vm" />
     <None Include="Resources\Templates\2008\Test1.cs.vm" />
     <None Include="Resources\Templates\2008\UnitTests.csproj.vm" />
+    <None Include="Resources\Templates\2010\AssemblyInfo.cs.vm" />
+    <None Include="Resources\Templates\2010\Core.csproj.vm" />
+    <None Include="Resources\Templates\2010\go.bat.vm" />
+    <None Include="Resources\Templates\2010\HelloWorld.cs.vm" />
+    <None Include="Resources\Templates\2010\Sapling.build.mbunit.vm" />
+    <None Include="Resources\Templates\2010\Sapling.build.nunit.vm" />
+    <None Include="Resources\Templates\2010\Sapling.sln.vm" />
+    <None Include="Resources\Templates\2010\SaplingConsole.csproj.vm" />
+    <None Include="Resources\Templates\2010\Test1.cs.vm" />
+    <None Include="Resources\Templates\2010\UnitTests.csproj.vm" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

File src/PresentationFoundationUI/PresentationFoundationUI.csproj

 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <ApplicationDefinition Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Page Include="TreeSurgeonWPFStartupForm.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>

File src/PresentationFoundationUI/Properties/Resources.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
             }
         }
     }
-}
+}

File src/PresentationFoundationUI/Properties/Settings.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:4.0.30319.1
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
             }
         }
     }
-}
+}

File src/TreeSurgeon.sln

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF8BC649-0F2E-4D34-A259-D406F0438C02}"
 	ProjectSection(SolutionItems) = preProject
 		..\go.bat = ..\go.bat
 		{7BFC0E3E-3348-4DE3-AC80-C9769699DA0C} = {A1DA5F04-D8AF-4824-ACB7-F8EE1CBE682E}
 		{7CF4428D-1BD0-4C5C-885E-2706C9C8D761} = {A1DA5F04-D8AF-4824-ACB7-F8EE1CBE682E}
 	EndGlobalSection
-EndGlobal
+EndGlobal

File src/TreeSurgeonConsole/TreeSurgeonConsole.csproj

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.30729</ProductVersion>
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
 mkdir "$(TargetDir)\Resources\skeleton\tools"
 mkdir "$(TargetDir)\Resources\skeleton\tools\nant"
 mkdir "$(TargetDir)\Resources\skeleton\tools\nunit"
+mkdir "$(TargetDir)\Resources\skeleton\tools\nunit\addins"
+mkdir "$(TargetDir)\Resources\skeleton\tools\nunit\framework"
+mkdir "$(TargetDir)\Resources\skeleton\tools\nunit\lib"
 mkdir "$(TargetDir)\Resources\skeleton\tools\MbUnit"
 mkdir "$(TargetDir)\Resources\skeleton\tools\NCover"
 mkdir "$(TargetDir)\Resources\skeleton\lib"

File src/TreeSurgeonConsoleApplication/TreeSurgeonCommandsContract.cs

             Type = OptionType.SingleValue,
             Name = "/v;/version", 
             Required = false, 
-            Default = "2008",
+            Default = "2010",
             Description = "Specifies the Visual Studio version to generate.\r\n\t" +
-                          "Valid options are: \"2003\", \"2005\", or \"2008\"\r\n\t" +
-                          "Default is \"2008\"")]
+                          "Valid options are: \"2003\", \"2005\", \"2008\", or \"2010\"\r\n\t" +
+                          "Default is \"2010\"")]
         public string Version { get; set; }
 
         [Option(
             Console.WriteLine("       Project Name: \"{0}\"", ProjectName);
             Console.WriteLine("            Version: \"{0}\"", Version);
             Console.WriteLine("Unit Test Framework: \"{0}\"", UnitTestFramework);
+            Console.WriteLine("          Overwrite: {0}", Overwrite);
             
             Console.WriteLine();
 

File src/TreeSurgeonConsoleApplication/TreeSurgeonConsoleApplication.csproj

 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <AssemblyName>TreeSurgeonConsoleApplication</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

File src/UnitTests/Core/SimpleTreeGeneratorTest.cs

 using System.Collections;
-using NMock;
+using NUnit.Mocks;
 using NUnit.Framework;
 using ThoughtWorks.TreeSurgeon.UnitTests.TestUtils;
 using TreeSurgeon.Core;

File src/UnitTests/UnitTests.csproj

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.21022</ProductVersion>
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nmock">
-      <Name>nmock</Name>
-      <HintPath>..\..\lib\nmock.dll</HintPath>
+    <Reference Include="nmock, Version=1.0.1721.15437, Culture=neutral">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\tools\nunit\addins\nmock.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <Name>nunit.framework</Name>
-      <HintPath>..\..\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.core">
+      <HintPath>..\..\tools\nunit\lib\nunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\tools\nunit\framework\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.mocks">
+      <HintPath>..\..\tools\nunit\framework\nunit.mocks.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

File src/WindowsUI/TreeSurgeonWindowsStartupForm.Designer.cs

             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.version2010RadioButton = new System.Windows.Forms.RadioButton();
             this.label7 = new System.Windows.Forms.Label();
             this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
             this.nunitRadionButton = new System.Windows.Forms.RadioButton();
             // version2005RadioButton
             // 
             this.version2005RadioButton.AutoSize = true;
-            this.version2005RadioButton.Checked = true;
             this.version2005RadioButton.Location = new System.Drawing.Point(58, 3);
             this.version2005RadioButton.Name = "version2005RadioButton";
             this.version2005RadioButton.Size = new System.Drawing.Size(49, 17);
             this.version2005RadioButton.TabIndex = 4;
-            this.version2005RadioButton.TabStop = true;
             this.version2005RadioButton.Text = "2005";
             this.version2005RadioButton.UseVisualStyleBackColor = true;
             // 
             this.version2008RadioButton.Name = "version2008RadioButton";
             this.version2008RadioButton.Size = new System.Drawing.Size(49, 17);
             this.version2008RadioButton.TabIndex = 5;
-            this.version2008RadioButton.TabStop = true;
             this.version2008RadioButton.Text = "2008";
             this.version2008RadioButton.UseVisualStyleBackColor = true;
             // 
             this.flowLayoutPanel1.Controls.Add(this.version2003RadioButton);
             this.flowLayoutPanel1.Controls.Add(this.version2005RadioButton);
             this.flowLayoutPanel1.Controls.Add(this.version2008RadioButton);
+            this.flowLayoutPanel1.Controls.Add(this.version2010RadioButton);
             this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.flowLayoutPanel1.Location = new System.Drawing.Point(168, 27);
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
             this.flowLayoutPanel1.Size = new System.Drawing.Size(311, 18);
             this.flowLayoutPanel1.TabIndex = 8;
             // 
+            // version2010RadioButton
+            // 
+            this.version2010RadioButton.AutoSize = true;
+            this.version2010RadioButton.Checked = true;
+            this.version2010RadioButton.Location = new System.Drawing.Point(168, 3);
+            this.version2010RadioButton.Name = "version2010RadioButton";
+            this.version2010RadioButton.Size = new System.Drawing.Size(49, 17);
+            this.version2010RadioButton.TabIndex = 6;
+            this.version2010RadioButton.TabStop = true;
+            this.version2010RadioButton.Text = "2010";
+            this.version2010RadioButton.UseVisualStyleBackColor = true;
+            // 
             // label7
             // 
             this.label7.Anchor = System.Windows.Forms.AnchorStyles.Right;
         private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
         private System.Windows.Forms.RadioButton nunitRadionButton;
         private System.Windows.Forms.RadioButton mbunitRadioButton;
+        private System.Windows.Forms.RadioButton version2010RadioButton;
     }
 }

File src/WindowsUI/TreeSurgeonWindowsStartupForm.cs

                 version = version2005RadioButton.Text;
             else if (version2008RadioButton.Checked)
                 version = version2008RadioButton.Text;
+            else if (version2010RadioButton.Checked)
+                version = version2010RadioButton.Text;
             return version;
         }
 
         {
             Close();
         }
+
+
     }
 }

File src/WindowsUI/WindowsUI.csproj

-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>9.0.21022</ProductVersion>
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>