Merge branch 'develop' into feature/alteration_for_columns_(#385)

# Conflicts: # NBi.Core/NBi.Core.csproj # NBi.Core/ResultSet/ColumnNameIdentifier.cs # NBi.Core/ResultSet/ColumnPositionIdentifier.cs # NBi.NUnit/Builder/Helper/ResultSetSystemHelper.cs # NBi.Testing.Core/ResultSet/ColumnIdentifierFactory.cs # NBi.Testing.Core/ResultSet/ColumnIdentifierFactoryTest.cs # NBi.Testing/Acceptance/Resources/Positive/ResultSetConstraint.nbits # NBi.Testing/Acceptance/RuntimeOverrider.cs # NBi.Testing/NBi.Testing.csproj # NBi.Testing/Unit/Core/ResultSet/ColumnIdentifierFactory.cs # NBi.Xml/Items/Alteration/AlterationXml.cs # NBi.Xml/NBi.Xml.csproj # NBi.Xml/Schema/BaseType.xsd
Seddryck · Aug 30, 2019 · a5c6cb0 · a5c6cb0
2 parents 654a790 + d7e59dc
commit a5c6cb0
Show file tree

Hide file tree

Showing 1,655 changed files with 129,295 additions and 52,127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,7 @@ Thumbs.db
 *.compiled.nuspec
 .nupkg/
 .vs/
+
+#Temp
+Daquar.*/
+NBi.Data3Sixty*/
diff --git a/.packages/NBi.Extensibility/NBi.Extensibility.nuspec b/.packages/NBi.Extensibility/NBi.Extensibility.nuspec
@@ -12,7 +12,7 @@
     <summary>Extensibility points of NBi.</summary>
     <description>This package contains the interfaces to implement to extend NBi features. Testing framework (add-on to NUnit) for Business Intelligence. It supports the Microsoft Data platform (SQL Server Database engine, SSIS, SSAS, SSRS) but also MySQL, PostgreSQL and other solutions.</description>
 	<releaseNotes>Check the release notes at https://github.com/Seddryck/NBi/releases/v$version$</releaseNotes>
-    <copyright>Copyright 2013-2018</copyright>
+    <copyright>Copyright 2013-$thisYear$</copyright>
     <tags>Test NBi SQL SSAS SSIS SSRS</tags>
   </metadata>
 </package>
diff --git a/.packages/NBi.Framework.Tools/NBi.Framework.Tools.nuspec b/.packages/NBi.Framework.Tools/NBi.Framework.Tools.nuspec
@@ -10,9 +10,9 @@
     <iconUrl>https://raw.githubusercontent.com/Seddryck/nbi/gh-pages/img/logo-2x.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>This package contains the NBi framework and copy it to the tools folder. This package is not intended to be directly used by end-users. Check the package NBi.VisualStudio, if you want to facilitate the usage of NBi from Visual Studio</summary>
-    <description>Testing framework (add-on to NUnit) for Business Intelligence. It supports the Microsoft Data platform (SQL Server Database engine, SSIS, SSAS, SSRS) but also MySQL, PostgreSQL and other solutions.</description>
+    <description>This package contains the NBi framework and copy it to the tools folder. This package is not intended to be directly used by end-users. Check the package NBi.VisualStudio, if you want to facilitate the usage of NBi from Visual StudioTesting framework (add-on to NUnit) for Business Intelligence. It supports the Microsoft Data platform (SQL Server Database engine, SSIS, SSAS, SSRS) but also MySQL, PostgreSQL and other solutions.</description>
 	<releaseNotes>Check the release notes at https://github.com/Seddryck/NBi/releases/v$version$</releaseNotes>
-    <copyright>Copyright 2013-2017</copyright>
+    <copyright>Copyright 2013-$thisYear$</copyright>
     <tags>Test NBi SQL SSAS SSIS SSRS</tags>
 	<dependencies>
 		$depList$

diff --git a/.packages/NBi.Framework/NBi.Framework.nuspec b/.packages/NBi.Framework/NBi.Framework.nuspec
@@ -10,10 +10,10 @@
     <iconUrl>https://raw.githubusercontent.com/Seddryck/nbi/gh-pages/img/logo-2x.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>This package contains the NBi framework and references all the dll to your project. This package is not intended to be directly used by end-users. Check the package NBi.VisualStudio, if you want to facilitate the usage of NBi from Visual Studio</summary>
-    <description>Testing framework (add-on to NUnit) for Business Intelligence. It supports the Microsoft Data platform (SQL Server Database engine, SSIS, SSAS, SSRS) but also MySQL, PostgreSQL and other solutions.</description>
+    <description>This package contains the NBi framework and references each dll to your project. This package is not intended to be directly used by end-users willing to create test-suites. Check the package NBi.VisualStudio, if you want to facilitate the usage of NBi from Visual StudioTesting framework (add-on to NUnit) for Business Intelligence. It supports the Microsoft Data platform (SQL Server Database engine, SSIS, SSAS, SSRS) but also MySQL, PostgreSQL and other solutions.</description>
 	<releaseNotes>Check the release notes at https://github.com/Seddryck/NBi/releases/v$version$</releaseNotes>
-    <copyright>Copyright 2013-2017</copyright>
-    <tags>Test NBi SQL SSAS SSIS SSRS</tags>
+    <copyright>Copyright 2013-$thisYear$</copyright>
+    <tags>Test NBi SQL SSAS SSIS SSRS </tags>
 	<dependencies>
 		$depList$
 	</dependencies>

diff --git a/.packages/package-NBi.ps1 b/.packages/package-NBi.ps1
@@ -9,7 +9,7 @@ Write-Host "Calculating dependencies ..."
 
 $dependencies = @{}
 $solutionRoot = Join-Path ($root) ".."
-$projects = Get-ChildItem $solutionRoot | ?{ $_.PSIsContainer -and $_.Name -like "NBi.*" -and $_.Name -notLike "*.UI*" -and $_.Name -notLike "*genbi*" -and $_.Name -notLike "*Service*"} | select Name, FullName
+$projects = Get-ChildItem $solutionRoot | ?{ $_.PSIsContainer -and $_.Name -like "NBi.*" -and $_.Name -notLike "*.UI*" -and $_.Name -notLike "*.Testing*" -and $_.Name -notLike "*genbi*" -and $_.Name -notLike "*Service*"} | select Name, FullName
 foreach($proj in $projects)
 {
     $projName = $proj.name
@@ -30,9 +30,12 @@ foreach($proj in $projects)
 Write-Host "Found $($dependencies.Count) dependencies ..."
 $depList = $dependencies.Values -join [Environment]::NewLine + "`t`t"
 
+$thisYear = get-date -Format yyyy
+Write-Host "Setting copyright until $thisYear"
+
 #For NBi.Framework (dll)
 Write-Host "Packaging NBi.Framework"
-$lib = "$root\NBi.Framework\lib\461\"
+$lib = "$root\NBi.Framework\lib\net461\"
 If (Test-Path $lib)
 {
 	Remove-Item $lib -recurse
@@ -44,8 +47,11 @@ Copy-Item $root\..\NBi.Testing\bin\Debug\NBi.Testing.dll $lib
 
 Write-Host "Setting .nuspec version tag to $version"
 
+
+
 $content = (Get-Content $root\NBi.Framework\NBi.Framework.nuspec -Encoding UTF8) 
 $content = $content -replace '\$version\$',$version
+$content = $content -replace '\$thisYear\$',$thisYear
 $content = $content -replace '\$depList\$',$depList
 
 $content | Out-File $root\NBi.Framework\NBi.Framework.compiled.nuspec -Encoding UTF8
@@ -68,6 +74,7 @@ Write-Host "Setting .nuspec version tag to $version"
 
 $content = (Get-Content $root\NBi.Framework.Tools\NBi.Framework.Tools.nuspec -Encoding UTF8) 
 $content = $content -replace '\$version\$',$version
+$content = $content -replace '\$thisYear\$',$thisYear
 $content = $content -replace '\$depList\$',$depList
 
 $content | Out-File $root\NBi.Framework.Tools\NBi.Framework.Tools.compiled.nuspec -Encoding UTF8
@@ -77,7 +84,7 @@ Write-Host "Package for NBi.Framework.Tools is ready"
 
 #For NBi.Extensibility
 Write-Host "Packaging NBi.Extensibility"
-$lib = "$root\NBi.Extensibility\lib\461\"
+$lib = "$root\NBi.Extensibility\lib\net461\"
 If (Test-Path $lib)
 {
 	Remove-Item $lib -recurse
@@ -90,6 +97,7 @@ Write-Host "Setting .nuspec version tag to $version"
 
 $content = (Get-Content $root\NBi.Extensibility\NBi.Extensibility.nuspec -Encoding UTF8) 
 $content = $content -replace '\$version\$',$version
+$content = $content -replace '\$thisYear\$',$thisYear
 
 $content | Out-File $root\NBi.Extensibility\NBi.Extensibility.compiled.nuspec -Encoding UTF8
 

diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -13,6 +13,10 @@
 
 //Reference the testing class to ensure access to internal members
 [assembly: InternalsVisibleTo("NBi.Testing")]
+[assembly: InternalsVisibleTo("NBi.Testing.Core")]
+[assembly: InternalsVisibleTo("NBi.Testing.Framework")]
+[assembly: InternalsVisibleTo("NBi.Testing.GenbiL")]
+[assembly: InternalsVisibleTo("NBi.Testing.Xml")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -23,6 +27,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.17")]
-[assembly: AssemblyFileVersion("1.17")]
-[assembly: AssemblyInformationalVersion("1.17")]
+[assembly: AssemblyVersion("1.19")]
+[assembly: AssemblyFileVersion("1.19")]
+[assembly: AssemblyInformationalVersion("1.19")]
diff --git a/AssemblyInfoPatcher.ps1 b/AssemblyInfoPatcher.ps1
@@ -2,8 +2,9 @@ param(
     [parameter(Mandatory=$true)]
     [string]$version
 )
-
-Write-Host "Looking to setup the version $version"
+(Get-childitem -Path ".") | Foreach-Object { 
+    Write-Host "$_"
+    }
 
 $parts = $version -split '-'
 $arr = $parts[0] -split '\.'
@@ -21,7 +22,7 @@ Write-Host "Patch: $($arr[2])"
 Write-Host "Build number: $($arr[3])"
 
 
-(Get-childitem -include AssemblyInfo.cs -recurse) | Foreach-Object { 
+(Get-childitem -Path . -include AssemblyInfo.cs -recurse) | Foreach-Object { 
     $path = $_
 	(Get-Content $_) | ForEach-Object{
 		if($_ -match '\[assembly: AssemblyVersion\("(.*)"\)\]'){

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,10 +1,15 @@
 mode: ContinuousDelivery
 branches:
-  dev(elop)?(ment)?$:
+  develop:
+    regex: dev(elop)?(ment)?$
     tag: beta
-  features?[/-]:
+  feature:
+    regex: features?[/-]
     tag: alpha
-  releases?[/-]:
-    tag: RC
+    source-branches: ['master', 'develop', 'feature', 'hotfix', 'support']
+  release:
+    regex: releases?[/-]
+    tag: rc
+    source-branches: ['hotfix', 'develop', 'master', 'feature', 'support']
 ignore:
   sha: []
diff --git a/NBi.Core.SqlServer/IntegrationService/EtlCatalogRunner.cs b/NBi.Core.SqlServer/IntegrationService/EtlCatalogRunner.cs