Skip to content

Commit

Permalink
JimEvans: Modifying .NET build process to sign assemblies. Building t…
Browse files Browse the repository at this point in the history
…he .NET bindings through the IDE or through the command line will now produce signed assemblies.

r12995
  • Loading branch information
jimevans committed Jul 19, 2011
1 parent 6c1f88e commit 8ef7967
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 4 deletions.
Binary file added WebDriver.snk
Binary file not shown.
8 changes: 6 additions & 2 deletions dotnet/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dotnet_library(name = "dotnet",
{"//cpp:noblur" : "WebDriver.FirefoxNoFocus.x86.dll"},
{"//cpp:noblur64" : "WebDriver.FirefoxNoFocus.x64.dll"}
],
keyfile = "WebDriver.snk",
out = "build/dotnet/WebDriver.dll",
doc = "build/dotnet/WebDriver.xml"
)
Expand All @@ -31,8 +32,9 @@ dotnet_library(name = "support",
":dotnet",
"third_party/csharp/Castle.Core.2.5.2/Castle.Core.dll"
],
out = "build/dotnet/Webdriver.Support.dll",
doc = "build/dotnet/Webdriver.Support.xml"
keyfile = "WebDriver.snk",
out = "build/dotnet/WebDriver.Support.dll",
doc = "build/dotnet/WebDriver.Support.xml"
)

dotnet_library(name = "core",
Expand All @@ -44,6 +46,7 @@ dotnet_library(name = "core",
"System.Xml.dll",
"System.Web.dll"
],
keyfile = "WebDriver.snk",
out = "build/dotnet/ThoughtWorks.Selenium.Core.dll",
doc = "build/dotnet/ThoughtWorks.Selenium.Core.xml"
)
Expand Down Expand Up @@ -76,6 +79,7 @@ dotnet_library(name = "webdriverbackedselenium",
{"//javascript/selenium-atoms:isVisible" : "isVisible.js" },
{"//javascript/selenium-atoms:type" : "type.js" }
],
keyfile = "WebDriver.snk",
out = "build/dotnet/Selenium.WebDriverBackedSelenium.dll",
doc = "build/dotnet/Selenium.WebDriverBackedSelenium.xml"
)
Expand Down
11 changes: 9 additions & 2 deletions dotnet/src/Selenium.Core/Selenium.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>ThoughtWorks.Selenium.Core</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
Expand Down Expand Up @@ -81,6 +80,9 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
Expand Down Expand Up @@ -139,6 +141,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\WebDriver.snk">
<Link>WebDriver.snk</Link>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -224,6 +230,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\WebDriver.snk">
<Link>WebDriver.snk</Link>
</None>
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>copy /y "$(SolutionDir)java\client\src\org\openqa\selenium\internal\seleniumemulation\injectableSelenium.js" "$(TargetDir)"
copy /y "$(SolutionDir)java\client\src\org\openqa\selenium\internal\seleniumemulation\htmlutils.js" "$(TargetDir)"
Expand Down
11 changes: 11 additions & 0 deletions dotnet/src/WebDriver.Support/WebDriver.Support.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@
<DocumentationFile>..\..\..\build\cli\Release\WebDriver.Support.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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.
Expand Down Expand Up @@ -123,4 +129,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\WebDriver.snk">
<Link>WebDriver.snk</Link>
</None>
</ItemGroup>
</Project>
11 changes: 11 additions & 0 deletions dotnet/src/WebDriver/WebDriver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@
<DocumentationFile>..\..\..\build\cli\Release\WebDriver.xml</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\..\WebDriver.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ionic.Zip.Reduced, Version=1.9.1.1, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -220,6 +226,11 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\WebDriver.snk">
<Link>WebDriver.snk</Link>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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.
Expand Down
1 change: 1 addition & 0 deletions rake-tasks/crazy_fun/mappings/visualstudio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def handle(fun, dir, args)
csc_task.debug = :pdbonly
csc_task.references references
csc_task.resources embedded_resources
csc_task.keyfile = args[:keyfile] unless args[:keyfile].nil?

copy_resources(dir, to_copy, output_dir)
unless args[:files].nil?
Expand Down

0 comments on commit 8ef7967

Please sign in to comment.