Skip to content

Merging in updates from base #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 16, 2018
Merged

Merging in updates from base #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e83be05
added " around msbuild path
Mar 22, 2018
a65dcf6
test mentioning signingkey.pfx in build
Mar 22, 2018
384b268
.
Mar 22, 2018
f2980d3
removed cert name
Mar 22, 2018
9bf9f7e
added Import-PfxCert.ps script
Mar 22, 2018
9eeedd0
.
Mar 22, 2018
751c28d
replaced " with actual "
Mar 22, 2018
04aca84
added CI(NoSigning) Build Configuration
Jun 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Build/Import-PfxCert.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
param($PfxFilePath, $Password)

$absolutePfxFilePath = Resolve-Path -Path $PfxFilePath
Write-Output "Importing store certificate '$absolutePfxFilePath'..."

Add-Type -AssemblyName System.Security
$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
$cert.Import($absolutePfxFilePath, $Password, [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet)
$store = new-object system.security.cryptography.X509Certificates.X509Store -argumentlist "MY", CurrentUser
$store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::"ReadWrite")
$store.Add($cert)
$store.Close()

#Source: http://blog.danskingdom.com/creating-a-pfx-certificate-and-applying-it-on-the-build-server-at-build-time/
16 changes: 8 additions & 8 deletions Build/tSQLt.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
</target>

<target name="clr.compile">
<echo message="Compile CLR Command: ${msbuild.path}msbuild.exe tSQLtCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<exec program="cmd" workingdir="../tSQLtCLR/tSQLtCLR/" failonerror="true">
<arg value="/c"/>
<arg value="${msbuild.path}msbuild.exe tSQLtCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtCLR.csproj /p:Configuration=CruiseControl /nologo"/>
</exec>

<exec program="cmd" workingdir="." failonerror="true" output="temp/Version.txt">
Expand All @@ -72,10 +72,10 @@
</target>

<target name="tSQLtExternalAccessKey.compile">
<echo message="Compile CLR Command: ${msbuild.path}msbuild.exe tSQLtExternalAccessKey.csproj /p:Configuration=CruiseControl /nologo"/>
<echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtExternalAccessKey.csproj /p:Configuration=CruiseControl /nologo"/>
<exec program="cmd" workingdir="../tSQLtCLR/tSQLtExternalAccessKey/" failonerror="true">
<arg value="/c"/>
<arg value="${msbuild.path}msbuild.exe tSQLtExternalAccessKey.csproj /p:Configuration=CruiseControl /nologo"/>
<arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtExternalAccessKey.csproj /p:Configuration=CruiseControl /nologo"/>
</exec>
</target>

Expand Down Expand Up @@ -169,18 +169,18 @@
</target>

<target name="clr.testutil.compile">
<echo message="Compile CLR Command: ${msbuild.path}msbuild.exe tSQLtTestUtilCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; tSQLtTestUtilCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<exec program="cmd" workingdir="../tSQLtCLR/tSQLtTestUtilCLR/" failonerror="true">
<arg value="/c"/>
<arg value="${msbuild.path}msbuild.exe tSQLtTestUtilCLR.csproj /p:Configuration=CruiseControl /nologo"/>
<arg value="&quot;${msbuild.path}msbuild.exe&quot; tSQLtTestUtilCLR.csproj /p:Configuration=CruiseControl /nologo"/>
</exec>
</target>

<target name="clr.UnsignedEmpty.compile">
<echo message="Compile CLR Command: ${msbuild.path}msbuild.exe UnsignedEmpty.csproj /p:Configuration=CruiseControl /nologo"/>
<echo message="Compile CLR Command: &quot;${msbuild.path}msbuild.exe&quot; UnsignedEmpty.csproj /p:Configuration=CruiseControl /nologo"/>
<exec program="cmd" workingdir="../tSQLtCLR/UnsignedEmpty/" failonerror="true">
<arg value="/c"/>
<arg value="${msbuild.path}msbuild.exe UnsignedEmpty.csproj /p:Configuration=CruiseControl /nologo"/>
<arg value="&quot;${msbuild.path}msbuild.exe&quot; UnsignedEmpty.csproj /p:Configuration=CruiseControl /nologo"/>
</exec>
</target>

Expand Down
5 changes: 5 additions & 0 deletions tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CruiseControl|AnyCPU'">
<OutputPath>bin\CruiseControl\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
<OutputPath>bin\CI%28NoSigning%29\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
Expand Down
34 changes: 32 additions & 2 deletions tSQLtCLR/tSQLtCLR.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2035
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tSQLtCLR", "tSQLtCLR\tSQLtCLR.csproj", "{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}"
EndProject
Expand All @@ -13,6 +13,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnsignedEmpty", "UnsignedEm
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CI(NoSigning)|Any CPU = CI(NoSigning)|Any CPU
CI(NoSigning)|Mixed Platforms = CI(NoSigning)|Mixed Platforms
CI(NoSigning)|x86 = CI(NoSigning)|x86
CruiseControl|Any CPU = CruiseControl|Any CPU
CruiseControl|Mixed Platforms = CruiseControl|Mixed Platforms
CruiseControl|x86 = CruiseControl|x86
Expand All @@ -24,6 +27,12 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|Any CPU
Expand All @@ -39,6 +48,12 @@ Global
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{309A14D6-7C8A-4022-BC2C-409FD7FE48AB}.Release|x86.ActiveCfg = Release|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|Any CPU
Expand All @@ -54,6 +69,12 @@ Global
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{87E64BC4-089C-4E9F-BCB2-DB12BDB5FB89}.Release|x86.ActiveCfg = Release|Any CPU
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.CruiseControl|Mixed Platforms.ActiveCfg = CruiseControl|x86
Expand All @@ -70,6 +91,12 @@ Global
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|Mixed Platforms.Build.0 = Release|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|x86.ActiveCfg = Release|x86
{09611E35-7E79-4DD3-8BCD-83F27535FB5D}.Release|x86.Build.0 = Release|x86
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Any CPU.ActiveCfg = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Any CPU.Build.0 = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Mixed Platforms.ActiveCfg = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|Mixed Platforms.Build.0 = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|x86.ActiveCfg = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CI(NoSigning)|x86.Build.0 = CI(NoSigning)|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Any CPU.ActiveCfg = CruiseControl|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Any CPU.Build.0 = CruiseControl|Any CPU
{14624277-A18F-4D80-BC04-FDFCD09E13D8}.CruiseControl|Mixed Platforms.ActiveCfg = Release|Any CPU
Expand All @@ -89,4 +116,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {732D09E1-56A0-4FFC-A5EC-6EBCEE3F7E92}
EndGlobalSection
EndGlobal
14 changes: 13 additions & 1 deletion tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand All @@ -64,6 +67,15 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
<OutputPath>bin\CI%28NoSigning%29\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
15 changes: 14 additions & 1 deletion tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand All @@ -73,6 +76,16 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<OutputPath>bin\CruiseControl\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|x86'">
<OutputPath>bin\x86\CI%28NoSigning%29\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
<OutputPath>bin\CI%28NoSigning%29\</OutputPath>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<None Include="SigningKey.pfx" />
</ItemGroup>
Expand Down
14 changes: 13 additions & 1 deletion tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,24 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' != 'CI%28NoSigning%29' ">
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'CI%28NoSigning%29' ">
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>SigningKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CI%28NoSigning%29|AnyCPU'">
<OutputPath>bin\CI%28NoSigning%29\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down