From e83be05139658e4944907ed496c9d52826db89ca Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 09:41:31 -0400 Subject: [PATCH 1/8] added " around msbuild path --- Build/tSQLt.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Build/tSQLt.build b/Build/tSQLt.build index dca688df7..fc96ac43e 100644 --- a/Build/tSQLt.build +++ b/Build/tSQLt.build @@ -49,10 +49,10 @@ - + - + @@ -72,10 +72,10 @@ - + - + @@ -169,18 +169,18 @@ - + - + - + - + From a65dcf6cfa39079384b10747a6120903b6f94ce3 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:08:27 -0400 Subject: [PATCH 2/8] test mentioning signingkey.pfx in build --- Build/tSQLt.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Build/tSQLt.build b/Build/tSQLt.build index fc96ac43e..5041c549d 100644 --- a/Build/tSQLt.build +++ b/Build/tSQLt.build @@ -3,6 +3,7 @@ Build tSQLt + @@ -49,10 +50,10 @@ - + - + From 384b2689a3242990bd2499e20953563972ea16c6 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:11:36 -0400 Subject: [PATCH 3/8] . --- Build/tSQLt.build | 1 - 1 file changed, 1 deletion(-) diff --git a/Build/tSQLt.build b/Build/tSQLt.build index 5041c549d..679e0fa5f 100644 --- a/Build/tSQLt.build +++ b/Build/tSQLt.build @@ -3,7 +3,6 @@ Build tSQLt - From f2980d37d04f47cfc96a9d7ae07a856d984d22a1 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:26:27 -0400 Subject: [PATCH 4/8] removed cert name --- Build/tSQLt.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/tSQLt.build b/Build/tSQLt.build index 679e0fa5f..fc96ac43e 100644 --- a/Build/tSQLt.build +++ b/Build/tSQLt.build @@ -49,10 +49,10 @@ - + - + From 9bf9f7e1cbe5693caf695d09f3bbcd2c38a64f99 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:29:13 -0400 Subject: [PATCH 5/8] added Import-PfxCert.ps script --- Build/Import-PfxCert.ps | Bin 0 -> 789 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Build/Import-PfxCert.ps diff --git a/Build/Import-PfxCert.ps b/Build/Import-PfxCert.ps new file mode 100644 index 0000000000000000000000000000000000000000..8c2b6ce6bd5d3794d1867250a0b4f3a10d8f9399 GIT binary patch literal 789 zcmb7C-AltT5P$Dq5wJ)HOD2jBoA@9DLBwr1MMZqLwzsaDG%>lT{qIeesbdV(m%x4G zejj%RET}A+ f2V-R0m22X<;j~1a`&yPf2z*1!fz~nA3J1w2QB@fM literal 0 HcmV?d00001 From 9eeedd0dfefc10e148eb2df5e178862606bac660 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:43:19 -0400 Subject: [PATCH 6/8] . --- Build/{Import-PfxCert.ps => Import-PfxCert.ps1} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Build/{Import-PfxCert.ps => Import-PfxCert.ps1} (100%) diff --git a/Build/Import-PfxCert.ps b/Build/Import-PfxCert.ps1 similarity index 100% rename from Build/Import-PfxCert.ps rename to Build/Import-PfxCert.ps1 From 751c28deb4258b0813f6076a596e78a93a2cc731 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Thu, 22 Mar 2018 11:47:06 -0400 Subject: [PATCH 7/8] replaced " with actual " --- Build/Import-PfxCert.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/Import-PfxCert.ps1 b/Build/Import-PfxCert.ps1 index 8c2b6ce6b..dcd02929f 100644 --- a/Build/Import-PfxCert.ps1 +++ b/Build/Import-PfxCert.ps1 @@ -1,13 +1,13 @@ param($PfxFilePath, $Password) $absolutePfxFilePath = Resolve-Path -Path $PfxFilePath -Write-Output "Importing store certificate '$absolutePfxFilePath'..." +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 = new-object system.security.cryptography.X509Certificates.X509Store -argumentlist "MY", CurrentUser +$store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::"ReadWrite") $store.Add($cert) $store.Close() From 04aca84c329dd1e06545cb5c65e7c5b8bd1dfb4a Mon Sep 17 00:00:00 2001 From: mbt1 Date: Sat, 30 Jun 2018 12:02:14 -0400 Subject: [PATCH 8/8] added CI(NoSigning) Build Configuration --- tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj | 5 +++ tSQLtCLR/tSQLtCLR.sln | 34 +++++++++++++++++-- tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj | 14 +++++++- .../tSQLtExternalAccessKey.csproj | 15 +++++++- .../tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj | 14 +++++++- 5 files changed, 77 insertions(+), 5 deletions(-) diff --git a/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj b/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj index 587f2226d..acba563a1 100644 --- a/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj +++ b/tSQLtCLR/UnsignedEmpty/UnsignedEmpty.csproj @@ -33,6 +33,11 @@ bin\CruiseControl\ + + bin\CI%28NoSigning%29\ + AnyCPU + MinimumRecommendedRules.ruleset + diff --git a/tSQLtCLR/tSQLtCLR.sln b/tSQLtCLR/tSQLtCLR.sln index cf3e3e847..144aceec0 100644 --- a/tSQLtCLR/tSQLtCLR.sln +++ b/tSQLtCLR/tSQLtCLR.sln @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -89,4 +116,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {732D09E1-56A0-4FFC-A5EC-6EBCEE3F7E92} + EndGlobalSection EndGlobal diff --git a/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj b/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj index e6d0e81b1..b2e48a705 100644 --- a/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj +++ b/tSQLtCLR/tSQLtCLR/tSQLtCLR.csproj @@ -50,9 +50,12 @@ prompt 4 - + true + + false + SigningKey.pfx @@ -64,6 +67,15 @@ AnyCPU prompt + + bin\CI%28NoSigning%29\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj index 2c72f0e7e..de204835a 100644 --- a/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj +++ b/tSQLtCLR/tSQLtExternalAccessKey/tSQLtExternalAccessKey.csproj @@ -49,9 +49,12 @@ prompt 4 - + true + + false + SigningKey.pfx @@ -73,6 +76,16 @@ AnyCPU bin\CruiseControl\ + + bin\x86\CI%28NoSigning%29\ + AnyCPU + MinimumRecommendedRules.ruleset + + + bin\CI%28NoSigning%29\ + AnyCPU + MinimumRecommendedRules.ruleset + diff --git a/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj index 41cfbaf21..12089adeb 100644 --- a/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj +++ b/tSQLtCLR/tSQLtTestUtilCLR/tSQLtTestUtilCLR.csproj @@ -39,12 +39,24 @@ AnyCPU prompt - + true + + false + SigningKey.pfx + + bin\CI%28NoSigning%29\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset +