Merge branch 'master' into xsltcustomisation

xerxesb · May 18, 2010 · 64e433d · 64e433d
2 parents 33c3d13 + fbdf3dc
commit 64e433d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/Runtime/Properties/AssemblyInfo.cs b/Runtime/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -22,4 +23,6 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("cba254bb-2476-4e96-9a9f-6db1a1b5eb62")]
 
+[assembly: AllowPartiallyTrustedCallers]
+
 [assembly: InternalsVisibleTo("TechTalk.SpecFlow.RuntimeTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001009BD35D42479A68A533445360CA3149C96BF112221527828DCCC15604830999FAD6391912EDBDF591531C4DE9C45E437A3F648A2A3722D04E5A02BECE96522C71060081A14E1E775DF4B6F84D6DB609E3A20D15956D3FEDBFD77B2A9B0D941ACABCBF7C26B87F5696FE4AADAACA69DCB84E7C733D5FF0E9ECEF46656D19BF52A2")]
diff --git a/TechTalk.SpecFlow.sln b/TechTalk.SpecFlow.sln
@@ -2,9 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}"
-	ProjectSection(SolutionItems) = preProject
-		changelog.txt = changelog.txt
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}"
 EndProject
@@ -32,17 +29,23 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.Generator
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechTalk.SpecFlow.Tools", "Tools\TechTalk.SpecFlow.Tools.csproj", "{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}"
 EndProject
-<<<<<<< HEAD
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImportGherkinParser", "Installer\ImportGherkinParser\ImportGherkinParser.csproj", "{0D3D2616-F53C-46A2-ADEB-273D140C1267}"
-=======
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeatureTests", "Tests\FeatureTests\FeatureTests.csproj", "{3FE793A8-E662-4026-B4EC-891324073235}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ExternalStepsVB", "Tests\FeatureTests\ExternalSteps\ExternalStepsVB\ExternalStepsVB.vbproj", "{D3F6B835-B228-4DCF-B533-B6ED469A33B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExternalStepsCS", "Tests\FeatureTests\ExternalSteps\ExternalStepsCS\ExternalStepsCS.csproj", "{3836A6FC-4ECC-413A-AC8F-83A0A773EC9E}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SpecFlowInstaller", "Installer\SpecFlowInstaller\SpecFlowInstaller.wixproj", "{89167EB9-F458-48DA-9D8F-F639A74F5871}"
->>>>>>> master
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{EF9D1EFD-574B-4A33-96CB-8885A6CEB227}"
+	ProjectSection(SolutionItems) = preProject
+		Installer\Resources\EULA.rtf = Installer\Resources\EULA.rtf
+		Installer\Resources\header.bmp = Installer\Resources\header.bmp
+		Installer\Resources\logo.png = Installer\Resources\logo.png
+		Installer\Resources\welcome_dialog.bmp = Installer\Resources\welcome_dialog.bmp
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -131,15 +134,17 @@ Global
 		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Any CPU.Build.0 = Release|Any CPU
-<<<<<<< HEAD
+		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|x86.ActiveCfg = Release|Any CPU
 		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Release|Any CPU.Build.0 = Release|Any CPU
-=======
-		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{87BE7FE6-C3DE-4409-ABF6-FA5B60AF3DE1}.Release|x86.ActiveCfg = Release|Any CPU
+		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0D3D2616-F53C-46A2-ADEB-273D140C1267}.Release|x86.ActiveCfg = Release|Any CPU
 		{3FE793A8-E662-4026-B4EC-891324073235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3FE793A8-E662-4026-B4EC-891324073235}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3FE793A8-E662-4026-B4EC-891324073235}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -180,19 +185,14 @@ Global
 		{89167EB9-F458-48DA-9D8F-F639A74F5871}.Release|Mixed Platforms.Build.0 = Release|x86
 		{89167EB9-F458-48DA-9D8F-F639A74F5871}.Release|x86.ActiveCfg = Release|x86
 		{89167EB9-F458-48DA-9D8F-F639A74F5871}.Release|x86.Build.0 = Release|x86
->>>>>>> master
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-<<<<<<< HEAD
-		{02F3B86D-0421-4D45-A701-44F3C94CF07D} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
-		{F6740296-282C-4A0F-941E-A8FD1B1DAC2D} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
 		{0D3D2616-F53C-46A2-ADEB-273D140C1267} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
-=======
 		{89167EB9-F458-48DA-9D8F-F639A74F5871} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
->>>>>>> master
+		{EF9D1EFD-574B-4A33-96CB-8885A6CEB227} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
 		{70376361-0BE1-478D-8EEC-47BD1C768165} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
 		{F8FACCF0-5497-4C6B-861F-78D72FD9561B} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
 		{3FE793A8-E662-4026-B4EC-891324073235} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}