diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 2c93ed3d5..db9e5688f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ +github: seddryck ko_fi: seddryck custom: ["https://paypal.me/cedriccharlier"] diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml new file mode 100644 index 000000000..c0a09e05c --- /dev/null +++ b/.github/workflows/combine-prs.yml @@ -0,0 +1,151 @@ +name: 'Combine PRs' + +# Controls when the action will run - in this case triggered manually +on: + workflow_dispatch: + inputs: + branchPrefix: + description: 'Branch prefix to find combinable PRs based on' + required: true + default: 'dependabot' + mustBeGreen: + description: 'Only combine PRs that are green (status is success)' + required: true + default: true + combineBranchName: + description: 'Name of the branch to combine PRs into' + required: true + default: 'combine-prs-branch' + ignoreLabel: + description: 'Exclude PRs with this label' + required: true + default: 'nocombine' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "combine-prs" + combine-prs: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + - uses: actions/github-script@v6 + id: create-combined-pr + name: Create Combined PR + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const pulls = await github.paginate('GET /repos/:owner/:repo/pulls', { + owner: context.repo.owner, + repo: context.repo.repo + }); + let branchesAndPRStrings = []; + let baseBranch = null; + let baseBranchSHA = null; + for (const pull of pulls) { + const branch = pull['head']['ref']; + console.log('Pull for branch: ' + branch); + if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) { + console.log('Branch matched prefix: ' + branch); + let statusOK = true; + if(${{ github.event.inputs.mustBeGreen }}) { + console.log('Checking green status: ' + branch); + const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) { + repository(owner: $owner, name: $repo) { + pullRequest(number:$pull_number) { + commits(last: 1) { + nodes { + commit { + statusCheckRollup { + state + } + } + } + } + } + } + }` + const vars = { + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: pull['number'] + }; + const result = await github.graphql(stateQuery, vars); + const [{ commit }] = result.repository.pullRequest.commits.nodes; + const state = commit.statusCheckRollup.state + console.log('Validating status: ' + state); + if(state != 'SUCCESS') { + console.log('Discarding ' + branch + ' with status ' + state); + statusOK = false; + } + } + console.log('Checking labels: ' + branch); + const labels = pull['labels']; + for(const label of labels) { + const labelName = label['name']; + console.log('Checking label: ' + labelName); + if(labelName == '${{ github.event.inputs.ignoreLabel }}') { + console.log('Discarding ' + branch + ' with label ' + labelName); + statusOK = false; + } + } + if (statusOK) { + console.log('Adding branch to array: ' + branch); + const prString = '#' + pull['number'] + ' ' + pull['title']; + branchesAndPRStrings.push({ branch, prString }); + baseBranch = pull['base']['ref']; + baseBranchSHA = pull['base']['sha']; + } + } + } + if (branchesAndPRStrings.length == 0) { + core.setFailed('No PRs/branches matched criteria'); + return; + } + try { + await github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'refs/heads/' + '${{ github.event.inputs.combineBranchName }}', + sha: baseBranchSHA + }); + } catch (error) { + console.log(error); + core.setFailed('Failed to create combined branch - maybe a branch by that name already exists?'); + return; + } + + let combinedPRs = []; + let mergeFailedPRs = []; + for(const { branch, prString } of branchesAndPRStrings) { + try { + await github.rest.repos.merge({ + owner: context.repo.owner, + repo: context.repo.repo, + base: '${{ github.event.inputs.combineBranchName }}', + head: branch, + }); + console.log('Merged branch ' + branch); + combinedPRs.push(prString); + } catch (error) { + console.log('Failed to merge branch ' + branch); + mergeFailedPRs.push(prString); + } + } + + console.log('Creating combined PR'); + const combinedPRsString = combinedPRs.join('\n'); + let body = '✅ This PR was created by the Combine PRs action by combining the following PRs:\n' + combinedPRsString; + if(mergeFailedPRs.length > 0) { + const mergeFailedPRsString = mergeFailedPRs.join('\n'); + body += '\n\n⚠️ The following PRs were left out due to merge conflicts:\n' + mergeFailedPRsString + } + await github.rest.pulls.create({ + owner: context.repo.owner, + repo: context.repo.repo, + title: 'Combined PR', + head: '${{ github.event.inputs.combineBranchName }}', + base: baseBranch, + body: body + }); diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs index 43ffa41ab..61c75a6b5 100644 --- a/AssemblyInfo.cs +++ b/AssemblyInfo.cs @@ -6,7 +6,7 @@ // associated with an assembly. [assembly: AssemblyCompany("NBi Team - Cdric L. Charlier")] [assembly: AssemblyProduct("NBi")] -[assembly: AssemblyCopyright("Copyright Cdric L. Charlier 2012-2021")] +[assembly: AssemblyCopyright("Copyright Cdric L. Charlier 2012-2023")] [assembly: AssemblyDescription("NBi is a testing framework (add-on to NUnit) for Microsoft Business Intelligence platform and Data Access. The main goal of this framework is to let users create tests with a declarative approach based on an Xml syntax. By the means of NBi, you don't need to develop C# code to specify your tests! Either, you don't need Visual Studio to compile your test suite. Just create an Xml file and let the framework interpret it and play your tests. The framework is designed as an add-on of NUnit but with the possibility to port it easily to other testing frameworks.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/NBi.Core/Api/Authentication/ApiKey.cs b/NBi.Core/Api/Authentication/ApiKey.cs index 8626b0965..c5001e9e7 100644 --- a/NBi.Core/Api/Authentication/ApiKey.cs +++ b/NBi.Core/Api/Authentication/ApiKey.cs @@ -32,9 +32,7 @@ public ApiKeyAuthenticator(string name, string value) => (Name, Value) = (name, value); public void Authenticate(IRestClient client, IRestRequest request) - { - request.AddHeader(Name, Value); - } + => request.AddHeader(Name, Value); } } } diff --git a/NBi.Core/NBi.Core.csproj b/NBi.Core/NBi.Core.csproj index 1c7bdef06..4d16f44d6 100644 --- a/NBi.Core/NBi.Core.csproj +++ b/NBi.Core/NBi.Core.csproj @@ -10,10 +10,12 @@ Properties NBi.Core NBi.Core - v4.6.1 + v4.6.2 512 ..\ + + true @@ -51,54 +53,80 @@ ..\packages\StringTemplate4.4.0.8\lib\net35-client\Antlr4.StringTemplate.dll - - ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll - ..\packages\Deedle.2.4.3\lib\netstandard2.0\Deedle.dll - - ..\packages\FSharp.Core.5.0.2\lib\netstandard2.0\FSharp.Core.dll + + ..\packages\FSharp.Core.7.0.0\lib\netstandard2.0\FSharp.Core.dll ..\packages\FuzzyString.1.0.0\lib\FuzzyString.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll + + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll - - ..\packages\Moq.4.16.1\lib\net45\Moq.dll + + ..\packages\Microsoft.IdentityModel.Abstractions.6.32.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll ..\packages\NCalc-Edge.1.5.0\lib\net35\NCalc.dll - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll + + ..\packages\Ninject.3.3.6\lib\net45\Ninject.dll ..\packages\PocketCsvReader.1.0.0\lib\net461\PocketCsvReader.dll - - ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + @@ -953,6 +981,13 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + Debug AnyCPU @@ -9,7 +9,7 @@ Properties NBi.Framework NBi.Framework - v4.6.1 + v4.6.2 512 ..\ @@ -33,15 +33,22 @@ 4 false + + true + - ..\packages\MarkdownLog.0.9.64\lib\netstandard2.0\MarkdownLog.dll + False + ..\librairies\MarkdownLog.dll - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + diff --git a/NBi.Framework/app.config b/NBi.Framework/app.config index 48e3e9e22..c4a224842 100644 --- a/NBi.Framework/app.config +++ b/NBi.Framework/app.config @@ -4,7 +4,7 @@ - + @@ -12,8 +12,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/NBi.Framework/packages.config b/NBi.Framework/packages.config index d67e43245..3d9e95a50 100644 --- a/NBi.Framework/packages.config +++ b/NBi.Framework/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/NBi.NUnit.Runtime/NBi.NUnit.Runtime.csproj b/NBi.NUnit.Runtime/NBi.NUnit.Runtime.csproj index 1bc94a83e..dce86bf6f 100644 --- a/NBi.NUnit.Runtime/NBi.NUnit.Runtime.csproj +++ b/NBi.NUnit.Runtime/NBi.NUnit.Runtime.csproj @@ -10,7 +10,7 @@ Properties NBi.NUnit.Runtime NBi.NUnit.Runtime - v4.6.1 + v4.6.2 512 ..\ @@ -46,12 +46,12 @@ false - - ..\packages\Dynamitey.2.0.9.136\lib\net40\Dynamitey.dll + + ..\packages\Dynamitey.2.0.10.189\lib\net40\Dynamitey.dll - - ..\packages\Ninject.3.3.4\lib\net45\Ninject.dll + + ..\packages\Ninject.3.3.6\lib\net45\Ninject.dll ..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.dll diff --git a/NBi.NUnit.Runtime/app.config b/NBi.NUnit.Runtime/app.config index 952f58877..d9f45af7e 100644 --- a/NBi.NUnit.Runtime/app.config +++ b/NBi.NUnit.Runtime/app.config @@ -4,7 +4,7 @@ - + @@ -20,7 +20,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.NUnit.Runtime/packages.config b/NBi.NUnit.Runtime/packages.config index 4457f27c9..cf7285621 100644 --- a/NBi.NUnit.Runtime/packages.config +++ b/NBi.NUnit.Runtime/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/NBi.NUnit/NBi.NUnit.csproj b/NBi.NUnit/NBi.NUnit.csproj index 961256e54..ab204587b 100644 --- a/NBi.NUnit/NBi.NUnit.csproj +++ b/NBi.NUnit/NBi.NUnit.csproj @@ -10,7 +10,7 @@ Properties NBi.NUnit NBi.NUnit - v4.6.1 + v4.6.2 512 ..\ true @@ -46,8 +46,8 @@ false - - ..\packages\Dynamitey.2.0.9.136\lib\net40\Dynamitey.dll + + ..\packages\Dynamitey.2.0.10.189\lib\net40\Dynamitey.dll ..\packages\ImpromptuInterface.7.0.1\lib\net40\ImpromptuInterface.dll diff --git a/NBi.NUnit/app.config b/NBi.NUnit/app.config index 48e3e9e22..f285c4726 100644 --- a/NBi.NUnit/app.config +++ b/NBi.NUnit/app.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.NUnit/packages.config b/NBi.NUnit/packages.config index bb5c258e2..b350af20b 100644 --- a/NBi.NUnit/packages.config +++ b/NBi.NUnit/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/NBi.Services/NBi.Service.csproj b/NBi.Services/NBi.Service.csproj deleted file mode 100644 index 0d1b11f48..000000000 --- a/NBi.Services/NBi.Service.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - Debug - AnyCPU - {A9C7E50A-1D3D-4C6D-9C56-8EA8925FE2D6} - Library - Properties - NBi.Service - NBi.Service - v4.6.1 - 512 - - ..\ - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\Antlr4.StringTemplate.4.0.6.9004\lib\net35\Antlr4.StringTemplate.dll - - - ..\packages\PocketCsvReader.1.0.0\lib\net461\PocketCsvReader.dll - - - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - - - - - - Properties\AssemblyInfo.cs - - - - - - {3f730647-fe31-4907-8a6e-a0c4a0c970ea} - NBi.Core - - - {a06cba63-d848-4dbc-abfc-63172613999d} - NBi.Extensibility - - - {3a9822b3-cce4-441b-9c3e-d52817a994ca} - NBi.Xml - - - - - - - - \ No newline at end of file diff --git a/NBi.Services/Properties/ProjectAssemblyInfo.cs b/NBi.Services/Properties/ProjectAssemblyInfo.cs deleted file mode 100644 index c5fae8c51..000000000 --- a/NBi.Services/Properties/ProjectAssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("NBi.Services")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cb15b89d-7174-4cdf-bf84-cb64ef07cb76")] diff --git a/NBi.Services/packages.config b/NBi.Services/packages.config deleted file mode 100644 index 6e747740d..000000000 --- a/NBi.Services/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NBi.Testing.Core/Api/Rest/RestEngineTest.cs b/NBi.Testing.Core/Api/Rest/RestEngineTest.cs index 7a6d32c5a..0fc9d002e 100644 --- a/NBi.Testing.Core/Api/Rest/RestEngineTest.cs +++ b/NBi.Testing.Core/Api/Rest/RestEngineTest.cs @@ -23,7 +23,8 @@ public void Execute_OneParameter_CorrectResponse() ); var engine = new RestEngine(new Anonymous(), baseUrl, null, new[] { parameter }, null, null); var result = engine.Execute(); - Assert.That(result, Does.StartWith("{\"name\":\"cedric\",\"age\":")); + Assert.That(result, Does.Contain("\"age\":")); + Assert.That(result, Does.Contain("\"name\":\"cedric\"")); } [Test] @@ -64,26 +65,26 @@ public void Execute_PathAndParameters_CorrectResponse() // Assert.That(result, Does.StartWith("{\"latest\":")); //} - [Test] - public void Execute_Segments_CorrectResponse() - { - var baseUrl = new LiteralScalarResolver("http://api.icndb.com"); - var path = new LiteralScalarResolver("/jokes/{id}"); - var segment = new SegmentRest( - new LiteralScalarResolver("id"), - new LiteralScalarResolver("268") - ); - var parameter1 = new ParameterRest( - new LiteralScalarResolver("firstName"), - new LiteralScalarResolver("John") - ); - var parameter2 = new ParameterRest( - new LiteralScalarResolver("firstName"), - new LiteralScalarResolver("John") - ); - var engine = new RestEngine(new Anonymous(), baseUrl, path, new[] { parameter1, parameter2 }, new[] { segment }, null); - var result = engine.Execute(); - Assert.That(result, Does.StartWith("{ \"type\": \"success\", \"value\": { \"id\": 268,")); - } + //[Test] + //public void Execute_Segments_CorrectResponse() + //{ + // var baseUrl = new LiteralScalarResolver("http://api.icndb.com"); + // var path = new LiteralScalarResolver("/jokes/{id}"); + // var segment = new SegmentRest( + // new LiteralScalarResolver("id"), + // new LiteralScalarResolver("268") + // ); + // var parameter1 = new ParameterRest( + // new LiteralScalarResolver("firstName"), + // new LiteralScalarResolver("John") + // ); + // var parameter2 = new ParameterRest( + // new LiteralScalarResolver("firstName"), + // new LiteralScalarResolver("John") + // ); + // var engine = new RestEngine(new Anonymous(), baseUrl, path, new[] { parameter1, parameter2 }, new[] { segment }, null); + // var result = engine.Execute(); + // Assert.That(result, Does.StartWith("{ \"type\": \"success\", \"value\": { \"id\": 268,")); + //} } } diff --git a/NBi.Testing.Core/ConnectionString.azuredevops.config b/NBi.Testing.Core/ConnectionString.azuredevops.config index 48374a333..d8e53e619 100644 --- a/NBi.Testing.Core/ConnectionString.azuredevops.config +++ b/NBi.Testing.Core/ConnectionString.azuredevops.config @@ -5,23 +5,23 @@ /> \ No newline at end of file diff --git a/NBi.Testing.Core/ConnectionString.config b/NBi.Testing.Core/ConnectionString.config index e4d1797f5..62a1d6b3e 100644 --- a/NBi.Testing.Core/ConnectionString.config +++ b/NBi.Testing.Core/ConnectionString.config @@ -5,23 +5,23 @@ /> \ No newline at end of file diff --git a/NBi.Testing.Core/NBi.Testing.Core.csproj b/NBi.Testing.Core/NBi.Testing.Core.csproj index a10877a01..5fa253664 100644 --- a/NBi.Testing.Core/NBi.Testing.Core.csproj +++ b/NBi.Testing.Core/NBi.Testing.Core.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -11,7 +11,7 @@ Properties NBi.Testing.Core NBi.Testing.Core - v4.6.1 + v4.6.2 512 true @@ -38,42 +38,57 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll + + ..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll ..\packages\Deedle.2.4.3\lib\netstandard2.0\Deedle.dll - - ..\packages\FSharp.Core.5.0.2\lib\netstandard2.0\FSharp.Core.dll + + ..\packages\Dynamitey.2.0.10.189\lib\net40\Dynamitey.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll + + ..\packages\FSharp.Core.7.0.0\lib\netstandard2.0\FSharp.Core.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll - - ..\packages\Moq.4.16.1\lib\net45\Moq.dll + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.32.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll + + + ..\packages\Moq.4.20.2\lib\net462\Moq.dll ..\packages\NCalc-Edge.1.5.0\lib\net35\NCalc.dll - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll - ..\packages\PocketCsvReader.1.0.0\lib\net461\PocketCsvReader.dll + ..\packages\PocketCsvReader.1.0.0\lib\net462\PocketCsvReader.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + @@ -361,7 +376,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + + + \ No newline at end of file diff --git a/NBi.Testing.Core/ResultSet/Alteration/Reshaping/UnstackEngineTest.cs b/NBi.Testing.Core/ResultSet/Alteration/Reshaping/UnstackEngineTest.cs index b1956d66f..ad9743133 100644 --- a/NBi.Testing.Core/ResultSet/Alteration/Reshaping/UnstackEngineTest.cs +++ b/NBi.Testing.Core/ResultSet/Alteration/Reshaping/UnstackEngineTest.cs @@ -218,7 +218,7 @@ public void Execute_EnforcedColumnsThatWasAlreadyExpected_ExpectedResultSet() [TestCase(100)] [TestCase(1000)] [TestCase(10000)] - [TestCase(40000)] + //[TestCase(40000)] [Retry(3)] [Parallelizable(ParallelScope.Self)] public void Execute_LargeResultSet_ExpectedPerformance(int count) diff --git a/NBi.Testing.Core/ResultSet/Equivalence/OrdinalEquivalerTest.cs b/NBi.Testing.Core/ResultSet/Equivalence/OrdinalEquivalerTest.cs index 8da537fdb..6107222da 100644 --- a/NBi.Testing.Core/ResultSet/Equivalence/OrdinalEquivalerTest.cs +++ b/NBi.Testing.Core/ResultSet/Equivalence/OrdinalEquivalerTest.cs @@ -62,8 +62,8 @@ public void Compare_SameRows_ReturnEqual() [TestCase(10, 1)] [TestCase(100, 1)] [TestCase(1000, 1)] - [TestCase(10000, 1)] - [TestCase(100000, 10)] + [TestCase(10000, 3)] + [TestCase(100000, 15)] //[TestCase(1000000, 30)] public void Compare_DifferentLargeArrays_ReturnQuicklyDifferent(int count, int timeout) { diff --git a/NBi.Testing.Core/ResultSet/Lookup/LookupMatchesAnalyzerTest.cs b/NBi.Testing.Core/ResultSet/Lookup/LookupMatchesAnalyzerTest.cs index 7add7b66c..172115e87 100644 --- a/NBi.Testing.Core/ResultSet/Lookup/LookupMatchesAnalyzerTest.cs +++ b/NBi.Testing.Core/ResultSet/Lookup/LookupMatchesAnalyzerTest.cs @@ -108,14 +108,14 @@ public void Execute_ReferenceLargerThanCandidateDuplicateKeys_NoViolation() } [Test] - public void Execute_MissingKeyInReference_OneViolation() + public void Execute_MissingKeyInReference_NoViolation() { var candidate = BuildDataTable(new[] { "Key0", "Key1" }, new object[] { 0, 1 }); var reference = BuildDataTable(new[] { "Key0", "Key2", "Key2", "Key0", "Key2" }, new object[] { 0, 1, 1, 1, 1 }); var analyzer = new LookupMatchesAnalyzer(BuildColumnMapping(1), BuildColumnMapping(1, 1)); var violations = analyzer.Execute(candidate, reference); - Assert.That(violations.Count(), Is.EqualTo(1)); + Assert.That(violations.Count(), Is.EqualTo(0)); } [Test] @@ -217,7 +217,7 @@ public void Execute_LargeVolumeCandidate_Fast(int maxItem) stopWatch.Start(); var violations = analyzer.Execute(candidate, reference); stopWatch.Stop(); - Assert.That(stopWatch.Elapsed.TotalSeconds, Is.LessThan(7)); + Assert.That(stopWatch.Elapsed.TotalSeconds, Is.LessThan(12)); } } } diff --git a/NBi.Testing.Core/Scalar/Resolver/EnvironmentScalarResolverTest.cs b/NBi.Testing.Core/Scalar/Resolver/EnvironmentScalarResolverTest.cs index 4fd418e84..c1356223c 100644 --- a/NBi.Testing.Core/Scalar/Resolver/EnvironmentScalarResolverTest.cs +++ b/NBi.Testing.Core/Scalar/Resolver/EnvironmentScalarResolverTest.cs @@ -11,20 +11,51 @@ namespace NBi.Testing.Core.Scalar.Resolver { public class EnvironmentScalarResolverTest { - [SetUp] - public void CreateEnvironmentVariable() => Environment.SetEnvironmentVariable("NBiTesting", "the_value", EnvironmentVariableTarget.User); - [TearDown] - public void DeleteEnvironmentVariable() => Environment.SetEnvironmentVariable("NBiTesting", null, EnvironmentVariableTarget.User); + [OneTimeSetUp] + public void CreateEnvironmentVariable() + { + Environment.SetEnvironmentVariable("NBiTestingProcess", "the_value_process", EnvironmentVariableTarget.Process); + Environment.SetEnvironmentVariable("NBiTestingUser", "the_value_user", EnvironmentVariableTarget.User); + } + + [OneTimeTearDown] + public void DeleteEnvironmentVariable() + { + Environment.SetEnvironmentVariable("NBiTestingProcess", null, EnvironmentVariableTarget.Process); + Environment.SetEnvironmentVariable("NBiTestingUser", null, EnvironmentVariableTarget.User); + } + + [Test] + public void Execute_EnvVarUser_CorrectRead() + { + var args = new EnvironmentScalarResolverArgs("NBiTestingUser"); + var resolver = new EnvironmentScalarResolver(args); + + var output = resolver.Execute(); + + Assert.That(output, Is.EqualTo("the_value_user")); + } + + [Test] + public void Execute_EnvVarProcess_CorrectRead() + { + var args = new EnvironmentScalarResolverArgs("NBiTestingProcess"); + var resolver = new EnvironmentScalarResolver(args); + + var output = resolver.Execute(); + + Assert.That(output, Is.EqualTo("the_value_process")); + } [Test] - public void Instantiate_GetValueObject_CorrectRead() + public void Execute_EnvVarMissing_CorrectRead() { - var args = new EnvironmentScalarResolverArgs("NBiTesting"); + var args = new EnvironmentScalarResolverArgs("NBiTestingMissing"); var resolver = new EnvironmentScalarResolver(args); var output = resolver.Execute(); - Assert.That(output, Is.EqualTo("the_value")); + Assert.That(output, Is.Null); } } } diff --git a/NBi.Testing.Core/app.config b/NBi.Testing.Core/app.config index 48e3e9e22..fafc7eab0 100644 --- a/NBi.Testing.Core/app.config +++ b/NBi.Testing.Core/app.config @@ -4,7 +4,7 @@ - + @@ -12,8 +12,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NBi.Testing.Core/packages.config b/NBi.Testing.Core/packages.config index f9b1f897e..66c0b9db8 100644 --- a/NBi.Testing.Core/packages.config +++ b/NBi.Testing.Core/packages.config @@ -1,14 +1,18 @@  - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NBi.Testing.Framework/NBi.Testing.Framework.csproj b/NBi.Testing.Framework/NBi.Testing.Framework.csproj index d47eb2138..46f77d5a3 100644 --- a/NBi.Testing.Framework/NBi.Testing.Framework.csproj +++ b/NBi.Testing.Framework/NBi.Testing.Framework.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -11,11 +11,12 @@ Properties NBi.Testing.Framework NBi.Testing.Framework - v4.6.1 + v4.6.2 512 true + true @@ -34,36 +35,38 @@ prompt 4 + + true + - - ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll + + ..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\packages\MarkdownLog.0.9.64\lib\netstandard2.0\MarkdownLog.dll + + ..\librairies\MarkdownLog.dll - - ..\packages\Moq.4.16.1\lib\net45\Moq.dll + + ..\packages\Moq.4.20.2\lib\net462\Moq.dll - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net462\System.Threading.Tasks.Extensions.dll - @@ -110,7 +113,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/NBi.Testing.Framework/app.config b/NBi.Testing.Framework/app.config index 48e3e9e22..51d7324ef 100644 --- a/NBi.Testing.Framework/app.config +++ b/NBi.Testing.Framework/app.config @@ -4,7 +4,7 @@ - + @@ -12,8 +12,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/NBi.Testing.Framework/packages.config b/NBi.Testing.Framework/packages.config index 0285bd28b..b177484ad 100644 --- a/NBi.Testing.Framework/packages.config +++ b/NBi.Testing.Framework/packages.config @@ -1,11 +1,11 @@  - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/NBi.Testing.GenbiL/NBi.Testing.GenbiL.csproj b/NBi.Testing.GenbiL/NBi.Testing.GenbiL.csproj index dbbbf30d6..0e2fd8712 100644 --- a/NBi.Testing.GenbiL/NBi.Testing.GenbiL.csproj +++ b/NBi.Testing.GenbiL/NBi.Testing.GenbiL.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -11,7 +11,7 @@ Properties NBi.Testing.GenbiL NBi.Testing.GenbiL - v4.6.1 + v4.6.2 512 true @@ -35,8 +35,8 @@ 4 - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll ..\packages\Sprache.2.3.1\lib\net45\Sprache.dll @@ -132,7 +132,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/NBi.Testing.GenbiL/app.config b/NBi.Testing.GenbiL/app.config index 48e3e9e22..1a54943ba 100644 --- a/NBi.Testing.GenbiL/app.config +++ b/NBi.Testing.GenbiL/app.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.Testing.GenbiL/packages.config b/NBi.Testing.GenbiL/packages.config index 16d7079fa..e0117e954 100644 --- a/NBi.Testing.GenbiL/packages.config +++ b/NBi.Testing.GenbiL/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/NBi.Testing.Xml/NBi.Testing.Xml.csproj b/NBi.Testing.Xml/NBi.Testing.Xml.csproj index ef0fd45c2..90eb6649e 100644 --- a/NBi.Testing.Xml/NBi.Testing.Xml.csproj +++ b/NBi.Testing.Xml/NBi.Testing.Xml.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -11,7 +11,7 @@ Properties NBi.Testing.Xml NBi.Testing.Xml - v4.6.1 + v4.6.2 512 true @@ -35,8 +35,8 @@ 4 - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll @@ -432,7 +432,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + \ No newline at end of file diff --git a/NBi.Testing.Xml/app.config b/NBi.Testing.Xml/app.config index 48e3e9e22..1a54943ba 100644 --- a/NBi.Testing.Xml/app.config +++ b/NBi.Testing.Xml/app.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.Testing.Xml/packages.config b/NBi.Testing.Xml/packages.config index c69dc7fd3..e538d7329 100644 --- a/NBi.Testing.Xml/packages.config +++ b/NBi.Testing.Xml/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/NBi.Testing/Acceptance/GenbiL/Resources/CaseCross-TestSuiteBuild.genbil b/NBi.Testing/Acceptance/GenbiL/Resources/CaseCross-TestSuiteBuild.genbil index 020f01ba9..a0b9bda25 100644 --- a/NBi.Testing/Acceptance/GenbiL/Resources/CaseCross-TestSuiteBuild.genbil +++ b/NBi.Testing/Acceptance/GenbiL/Resources/CaseCross-TestSuiteBuild.genbil @@ -7,7 +7,7 @@ case filter on column 'dimension' values not like 'exclude%'; case scope 'hierarchy'; case load query 'Acceptance\GenbiL\Resources\hierarchy.sql' - on 'Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12!'; + on 'Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12!'; case filter on column 'hierarchy' values not equal 'third-hierarchy' ; case remove column 'perspective'; diff --git a/NBi.Testing/Acceptance/GenbiL/Resources/MatchPattern.genbil b/NBi.Testing/Acceptance/GenbiL/Resources/MatchPattern.genbil index fe66a8406..5c341e023 100644 --- a/NBi.Testing/Acceptance/GenbiL/Resources/MatchPattern.genbil +++ b/NBi.Testing/Acceptance/GenbiL/Resources/MatchPattern.genbil @@ -4,7 +4,7 @@ case load query { select '3' as decimalDigit, '.' as decimalSeparator, ',' as thousandSeparator } -on 'Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12!'; +on 'Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12!'; //Load the template from a file template load file 'Acceptance\GenbiL\Resources\MatchPattern.nbitt'; diff --git a/NBi.Testing/Acceptance/GenbiL/Resources/Simple-TestSuiteBuild.genbil b/NBi.Testing/Acceptance/GenbiL/Resources/Simple-TestSuiteBuild.genbil index 7d2d73002..5b50667cb 100644 --- a/NBi.Testing/Acceptance/GenbiL/Resources/Simple-TestSuiteBuild.genbil +++ b/NBi.Testing/Acceptance/GenbiL/Resources/Simple-TestSuiteBuild.genbil @@ -21,7 +21,7 @@ suite generate grouping; case load query 'Acceptance\GenbiL\Resources\hierarchy.sql' - on 'Data Source=.\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12!'; + on 'Data Source=.\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12!'; case filter on column 'hierarchy' values not equal 'third-hierarchy' ; template load predefined 'ExistsHierarchy'; suite generate; @@ -38,7 +38,7 @@ case load query union all select 'fourth-hierarchy' as hierarchy, 'second-dimension' as dimension, 'first-perspective' as perspective } -on 'Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12!'; +on 'Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12!'; case filter on column 'dimension' values like 'first-%' ; case move column 'dimension' to right; case move column 'perspective' to left; diff --git a/NBi.Testing/Acceptance/Resources/Ignored/Ignored.nbits b/NBi.Testing/Acceptance/Resources/Ignored/Ignored.nbits index 3be31ea1d..426e57871 100644 --- a/NBi.Testing/Acceptance/Resources/Ignored/Ignored.nbits +++ b/NBi.Testing/Acceptance/Resources/Ignored/Ignored.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Config-Full-Json.nbits b/NBi.Testing/Acceptance/Resources/Negative/Config-Full-Json.nbits index 1765d93d3..ca093f297 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Config-Full-Json.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Config-Full-Json.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Config-Full.nbits b/NBi.Testing/Acceptance/Resources/Negative/Config-Full.nbits index 1765d93d3..ca093f297 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Config-Full.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Config-Full.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Config-Light.nbits b/NBi.Testing/Acceptance/Resources/Negative/Config-Light.nbits index 1765d93d3..ca093f297 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Config-Light.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Config-Light.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/DataRowsMessage.nbits b/NBi.Testing/Acceptance/Resources/Negative/DataRowsMessage.nbits index 5ae0627f8..19b8f0792 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/DataRowsMessage.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/DataRowsMessage.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/ItemsMessage.nbits b/NBi.Testing/Acceptance/Resources/Negative/ItemsMessage.nbits index e3806c1a4..f9fe322c5 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/ItemsMessage.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/ItemsMessage.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Lookup-Exists-Json.nbits b/NBi.Testing/Acceptance/Resources/Negative/Lookup-Exists-Json.nbits index a0887052e..5cdcd9b97 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Lookup-Exists-Json.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Lookup-Exists-Json.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Lookup-Matches-Json.nbits b/NBi.Testing/Acceptance/Resources/Negative/Lookup-Matches-Json.nbits index 05357cb38..3cc0c7f08 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Lookup-Matches-Json.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Lookup-Matches-Json.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Lookup-ReverseExists-Json.nbits b/NBi.Testing/Acceptance/Resources/Negative/Lookup-ReverseExists-Json.nbits index aeb49f623..69d58a43c 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Lookup-ReverseExists-Json.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Lookup-ReverseExists-Json.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Negative/Scoring-Json.nbits b/NBi.Testing/Acceptance/Resources/Negative/Scoring-Json.nbits index 2ba0a23e4..5a844a0ca 100644 --- a/NBi.Testing/Acceptance/Resources/Negative/Scoring-Json.nbits +++ b/NBi.Testing/Acceptance/Resources/Negative/Scoring-Json.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/AssemblyEqualToResultSet.nbits b/NBi.Testing/Acceptance/Resources/Positive/AssemblyEqualToResultSet.nbits index f22136eea..a4ba1dc78 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/AssemblyEqualToResultSet.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/AssemblyEqualToResultSet.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 diff --git a/NBi.Testing/Acceptance/Resources/Positive/Contain.nbits b/NBi.Testing/Acceptance/Resources/Positive/Contain.nbits index 3efa5831e..97028b180 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Contain.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Contain.nbits @@ -2,16 +2,16 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 @@ -74,7 +74,7 @@ diff --git a/NBi.Testing/Acceptance/Resources/Positive/ContainStructure.nbits b/NBi.Testing/Acceptance/Resources/Positive/ContainStructure.nbits index ad9feef33..f5e51da7c 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/ContainStructure.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/ContainStructure.nbits @@ -2,13 +2,13 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Provider=MSOLAP.4;Data Source=(local)\SQL2017TABULAR;Initial Catalog='AdventureWorks Tabular Model SQL 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022TABULAR;Initial Catalog='AdventureWorks Tabular Model SQL 2012';localeidentifier=1033 @@ -62,7 +62,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/NBi.Testing/Acceptance/Resources/Positive/Count.nbits b/NBi.Testing/Acceptance/Resources/Positive/Count.nbits index baaa4b264..daf0ea6af 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Count.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Count.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 diff --git a/NBi.Testing/Acceptance/Resources/Positive/Decoration.nbits b/NBi.Testing/Acceptance/Resources/Positive/Decoration.nbits index f6ed726ad..eda7f1938 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Decoration.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Decoration.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;Integrated Security=true + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;Integrated Security=true - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;Integrated Security=true + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;Integrated Security=true diff --git a/NBi.Testing/Acceptance/Resources/Positive/Environment.nbits b/NBi.Testing/Acceptance/Resources/Positive/Environment.nbits index 05d1fb819..51ff6de72 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Environment.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Environment.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/EquivalentToMembers.nbits b/NBi.Testing/Acceptance/Resources/Positive/EquivalentToMembers.nbits index 77556905f..41fef9d4c 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/EquivalentToMembers.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/EquivalentToMembers.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -101,7 +101,7 @@ diff --git a/NBi.Testing/Acceptance/Resources/Positive/EquivalentToStructure.nbits b/NBi.Testing/Acceptance/Resources/Positive/EquivalentToStructure.nbits index 55d798c7e..000d6927b 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/EquivalentToStructure.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/EquivalentToStructure.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 diff --git a/NBi.Testing/Acceptance/Resources/Positive/EvaluateRows.nbits b/NBi.Testing/Acceptance/Resources/Positive/EvaluateRows.nbits index ad8237730..7b3313966 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/EvaluateRows.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/EvaluateRows.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -78,7 +78,7 @@ - + select { [Measures].[Internet Sales Amount] , [Measures].[Internet Total Product Cost] diff --git a/NBi.Testing/Acceptance/Resources/Positive/Exists.nbits b/NBi.Testing/Acceptance/Resources/Positive/Exists.nbits index 6ecdc035b..184324acd 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Exists.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Exists.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -158,7 +158,7 @@ @@ -174,7 +174,7 @@ diff --git a/NBi.Testing/Acceptance/Resources/Positive/ExternalSettings.nbits b/NBi.Testing/Acceptance/Resources/Positive/ExternalSettings.nbits index 2424eeb26..5b707addb 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/ExternalSettings.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/ExternalSettings.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/FasterThan.nbits b/NBi.Testing/Acceptance/Resources/Positive/FasterThan.nbits index 382962db5..356f18e75 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/FasterThan.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/FasterThan.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -11,7 +11,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, EXCEPT({[Date].[Calendar Year].Children},{[Date].[Calendar Year].[CY 2006]}) ON 1 diff --git a/NBi.Testing/Acceptance/Resources/Positive/Is.nbits b/NBi.Testing/Acceptance/Resources/Positive/Is.nbits index f566264ed..4eed2eed1 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Is.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Is.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/LinkedTo.nbits b/NBi.Testing/Acceptance/Resources/Positive/LinkedTo.nbits index e2adda9b2..710fca34a 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/LinkedTo.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/LinkedTo.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 diff --git a/NBi.Testing/Acceptance/Resources/Positive/MatchPatternMembers.nbits b/NBi.Testing/Acceptance/Resources/Positive/MatchPatternMembers.nbits index 585bd38fe..91d885a20 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/MatchPatternMembers.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/MatchPatternMembers.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 diff --git a/NBi.Testing/Acceptance/Resources/Positive/MultipleInstance.nbits b/NBi.Testing/Acceptance/Resources/Positive/MultipleInstance.nbits index 855012391..09e99eef0 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/MultipleInstance.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/MultipleInstance.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -408,7 +408,7 @@ - + select '2016-01-01' union all select '2016-02-01' union all select '2016-03-01' diff --git a/NBi.Testing/Acceptance/Resources/Positive/Ordered.nbits b/NBi.Testing/Acceptance/Resources/Positive/Ordered.nbits index 7280d33b1..80fbbebe4 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Ordered.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Ordered.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 @@ -87,7 +87,7 @@ - + select 'Actual' union all select 'Budget' union all select 'Forecast' diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryAllNoRows.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryAllNoRows.nbits index 5c2fdde18..eb9871069 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryAllNoRows.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryAllNoRows.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -647,7 +647,7 @@ select 10 as 'A' ,11 as 'B', 12 as 'C' union all select 5,6,7 @@ -669,7 +669,7 @@ select 10 as 'A' ,11 as 'B', 12 as 'C' union all select 5,6,7 @@ -690,7 +690,7 @@ select 10 as 'A' ,11 as 'B', 12 as 'C' union all select 5,6,7 @@ -712,7 +712,7 @@ select '2019-10-01 06:00:00' as A, '2019-09-30 04:47:00' as 'B', 12 as 'C' union all select '2019-10-01 23:00:00', '2019-10-01 04:42:00' as 'B',7 @@ -745,7 +745,7 @@ select '2019-10-01 06:00:00' as Ref, '07:00:00' as MaxTime, '2019-10-01 06:47:00' as Effective union all select '2019-10-01 22:15:00', '23:00:00', '2019-10-01 22:42:00' @@ -780,7 +780,7 @@ select 'A' as 'Col1' union all select 'B' diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsv.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsv.nbits index a3f92d468..c0c2c3aea 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsv.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsv.nbits @@ -6,7 +6,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, {[Date].[Calendar Year].[CY 2005]:[Date].[Calendar Year].[CY 2008]} ON 1 @@ -26,7 +26,7 @@ - + SELECT 'A', 105 UNION ALL @@ -46,7 +46,7 @@ - + SELECT 'A', 105 @@ -74,7 +74,7 @@ - + select 'Key', 'Wrong', /*Should be ignored*/ diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsvWithProfile.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsvWithProfile.nbits index 564b1f30d..608f1d17c 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsvWithProfile.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToCsvWithProfile.nbits @@ -9,7 +9,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, {[Date].[Calendar Year].[CY 2005]:[Date].[Calendar Year].[CY 2008]} ON 1 @@ -29,7 +29,7 @@ - + SELECT [Key]=1,Val1='2',Val3=NULL,Val3='3' UNION SELECT [Key]=4,Val1=NULL,Val2='3',Val3='' diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery - MySQL.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery - MySQL.nbits index 7ff99a76d..18a13ca1b 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery - MySQL.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery - MySQL.nbits @@ -5,7 +5,7 @@ Driver={MySQL ODBC 5.3 ANSI Driver};Server=eu-cdbr-azure-west-d.cloudapp.net;User=bdfdabafa6c4ff;password=562d3996 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -14,7 +14,7 @@ - + WITH MEMBER [Measures].[Reseller Order Count Divided by 7] AS @@ -47,7 +47,7 @@ - + select [Measures].[Internet Order Count] on 0, [Date].[Date].Children on 1 @@ -58,7 +58,7 @@ - + select [Measures].[Internet Order Count] on 0, [Date].[Date].Children on 1 @@ -229,14 +229,14 @@ - + select 'OK'; - + select 'OK'; @@ -245,14 +245,14 @@ - + select 'OK'; - + select 'OK'; diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery.nbits index b2de2a240..5e6d3047c 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToQuery.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -38,7 +38,7 @@ - + WITH MEMBER [Measures].[Reseller Order Count Divided by 7] AS @@ -71,7 +71,7 @@ - + select [Measures].[Internet Order Count] on 0, [Date].[Date].Children on 1 @@ -82,7 +82,7 @@ - + select [Measures].[Internet Order Count] on 0, [Date].[Date].Children on 1 @@ -259,14 +259,14 @@ - + select 'OK'; - + select 'OK'; @@ -275,14 +275,14 @@ - + select 'OK'; - + select 'OK'; diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSet.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSet.nbits index 276f2a793..52d2841a4 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSet.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSet.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -239,7 +239,7 @@ EVALUATE CALCULATETABLE( @@ -271,7 +271,7 @@ evaluate( row( @@ -296,7 +296,7 @@ select [Name], [CountryRegionCode] @@ -330,7 +330,7 @@ select [Name], [CountryRegionCode] @@ -365,7 +365,7 @@ select [Name], [CountryRegionCode] @@ -399,7 +399,7 @@ select cast ('2015-12-16' as date), 412.25 union all select cast ('2015-12-17' as date), 725.0 @@ -426,7 +426,7 @@ select 'Cédric Charlier' @@ -469,7 +469,7 @@ select 'Water' @@ -504,7 +504,7 @@ select 'Water' diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSetWithNull.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSetWithNull.nbits index fa69ed3d3..746446b64 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSetWithNull.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToResultSetWithNull.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -11,7 +11,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, {[Date].[Calendar Year].[CY 2005]:[Date].[Calendar Year].[CY 2009]} ON 1 diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToWithParameter.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToWithParameter.nbits index 59812b715..b37760c2d 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToWithParameter.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToWithParameter.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! AED diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToXml.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToXml.nbits index 223aa5dcb..02e48ae25 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToXml.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryEqualToXml.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -91,7 +91,7 @@ - + diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryRowCount.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryRowCount.nbits index 0610d4409..dff225087 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryRowCount.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryRowCount.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -14,7 +14,7 @@ select 3 @@ -105,7 +105,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, {[Date].[Calendar Year].[CY 2005]:[Date].[Calendar Year].[CY 2008]} ON 1 @@ -132,7 +132,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, {[Date].[Calendar Year].[CY 2005]:[Date].[Calendar Year].[CY 2008]} ON 1 diff --git a/NBi.Testing/Acceptance/Resources/Positive/QuerySubsetOfQuery.nbits b/NBi.Testing/Acceptance/Resources/Positive/QuerySubsetOfQuery.nbits index 299fddbf6..5f36e3db5 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QuerySubsetOfQuery.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QuerySubsetOfQuery.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/QuerySupersetOfQuery.nbits b/NBi.Testing/Acceptance/Resources/Positive/QuerySupersetOfQuery.nbits index 72d3bc5d7..88c16259e 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QuerySupersetOfQuery.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QuerySupersetOfQuery.nbits @@ -2,10 +2,10 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryUniqueRows.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryUniqueRows.nbits index 394499811..ef49451b8 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryUniqueRows.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryUniqueRows.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryWithParameters.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryWithParameters.nbits index 5190d169d..4cea6d01a 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryWithParameters.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryWithParameters.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012' + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012' - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -205,7 +205,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, STRTOMEMBER(@YearMember) ON 1 @@ -247,7 +247,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, STRTOMEMBER(@YearMember) ON 1 diff --git a/NBi.Testing/Acceptance/Resources/Positive/QueryWithReference.nbits b/NBi.Testing/Acceptance/Resources/Positive/QueryWithReference.nbits index 88b85cdcd..340429878 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/QueryWithReference.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/QueryWithReference.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 diff --git a/NBi.Testing/Acceptance/Resources/Positive/ReportEqualTo.nbits b/NBi.Testing/Acceptance/Resources/Positive/ReportEqualTo.nbits index 81d49ad4e..b5694f2db 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/ReportEqualTo.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/ReportEqualTo.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -12,7 +12,7 @@ - - diff --git a/NBi.Testing/Acceptance/Resources/Positive/ResultSetConstraint.nbits b/NBi.Testing/Acceptance/Resources/Positive/ResultSetConstraint.nbits index 44273cb16..bb29aae5e 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/ResultSetConstraint.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/ResultSetConstraint.nbits @@ -2,16 +2,16 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -438,7 +438,7 @@ - - + + @@ -2549,7 +2549,7 @@ [FooBarId] - + select 1 as FooBarId, 'Foo' as ValueX union all select 2, 'Bar' diff --git a/NBi.Testing/Acceptance/Resources/Positive/ResultSetMatchPattern.nbits b/NBi.Testing/Acceptance/Resources/Positive/ResultSetMatchPattern.nbits index 7d454ad6e..3aaa49c80 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/ResultSetMatchPattern.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/ResultSetMatchPattern.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1049 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/Acceptance/Resources/Positive/SubsetOfMembers.nbits b/NBi.Testing/Acceptance/Resources/Positive/SubsetOfMembers.nbits index 8d66287ab..b778b32ca 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/SubsetOfMembers.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/SubsetOfMembers.nbits @@ -2,10 +2,10 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! @@ -62,7 +62,7 @@ diff --git a/NBi.Testing/Acceptance/Resources/Positive/SubsetOfStructure.nbits b/NBi.Testing/Acceptance/Resources/Positive/SubsetOfStructure.nbits index a2ab7832a..6dd3de97b 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/SubsetOfStructure.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/SubsetOfStructure.nbits @@ -2,7 +2,7 @@ - Provider=MSOLAP.4;Data Source=(local)\SQL2017;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 + Provider=MSOLAP.4;Data Source=(local)\SQL2022;Initial Catalog='Adventure Works DW 2012';localeidentifier=1033 diff --git a/NBi.Testing/Acceptance/Resources/Positive/SyntacticallyCorrect.nbits b/NBi.Testing/Acceptance/Resources/Positive/SyntacticallyCorrect.nbits index 1c17e54a1..ddecf6153 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/SyntacticallyCorrect.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/SyntacticallyCorrect.nbits @@ -6,7 +6,7 @@ - + SELECT [Measures].[Reseller Order Count] ON 0, EXCEPT({[Date].[Calendar Year].Children},{[Date].[Calendar Year].[CY 2006]}) ON 1 @@ -19,13 +19,13 @@ - + - + SELECT NULL diff --git a/NBi.Testing/Acceptance/Resources/Positive/Variable.nbits b/NBi.Testing/Acceptance/Resources/Positive/Variable.nbits index a3a388763..90d3bcabf 100644 --- a/NBi.Testing/Acceptance/Resources/Positive/Variable.nbits +++ b/NBi.Testing/Acceptance/Resources/Positive/Variable.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/ConnectionString.azuredevops.config b/NBi.Testing/ConnectionString.azuredevops.config index 41b7e5379..6c34deccd 100644 --- a/NBi.Testing/ConnectionString.azuredevops.config +++ b/NBi.Testing/ConnectionString.azuredevops.config @@ -5,23 +5,23 @@ /> \ No newline at end of file diff --git a/NBi.Testing/ConnectionString.config b/NBi.Testing/ConnectionString.config index 238614299..89148d3a3 100644 --- a/NBi.Testing/ConnectionString.config +++ b/NBi.Testing/ConnectionString.config @@ -5,47 +5,47 @@ /> \ No newline at end of file diff --git a/NBi.Testing/Integration/NUnit/Runtime/Embed/Resources/SmallTestSuite.nbits b/NBi.Testing/Integration/NUnit/Runtime/Embed/Resources/SmallTestSuite.nbits index 1223e4a51..9742b3556 100644 --- a/NBi.Testing/Integration/NUnit/Runtime/Embed/Resources/SmallTestSuite.nbits +++ b/NBi.Testing/Integration/NUnit/Runtime/Embed/Resources/SmallTestSuite.nbits @@ -2,7 +2,7 @@ - Data Source=(local)\SQL2017;Initial Catalog=AdventureWorks2017;User Id=sa;password=Password12! + Data Source=(local)\SQL2022;Initial Catalog=AdventureWorks2022;User Id=sa;password=Password12! diff --git a/NBi.Testing/NBi.Testing.csproj b/NBi.Testing/NBi.Testing.csproj index 39f79b63c..f2732e4af 100644 --- a/NBi.Testing/NBi.Testing.csproj +++ b/NBi.Testing/NBi.Testing.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -11,7 +11,7 @@ Properties NBi.Testing NBi.Testing - v4.6.1 + v4.6.2 512 ..\ true @@ -51,32 +51,29 @@ false - - ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll + + ..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\packages\Deedle.2.4.3\lib\netstandard2.0\Deedle.dll + + ..\packages\Dynamitey.2.0.10.189\lib\net40\Dynamitey.dll - - ..\packages\Dynamitey.2.0.9.136\lib\net40\Dynamitey.dll + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll - - ..\packages\FSharp.Core.5.0.2\lib\netstandard2.0\FSharp.Core.dll + + ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.65.12\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\MarkdownLog.0.9.64\lib\netstandard2.0\MarkdownLog.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.AdomdClient.dll + + ..\packages\Microsoft.IdentityModel.Abstractions.6.32.1\lib\net462\Microsoft.IdentityModel.Abstractions.dll - - ..\packages\Microsoft.AnalysisServices.AdomdClient.retail.amd64.19.26.1.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Moq.4.20.2\lib\net462\Moq.dll - - ..\packages\Moq.4.16.1\lib\net45\Moq.dll - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.dll @@ -88,7 +85,7 @@ ..\packages\NUnit.2.7.1\lib\nunit.framework.dll - ..\packages\PocketCsvReader.1.0.0\lib\net461\PocketCsvReader.dll + ..\packages\PocketCsvReader.1.0.0\lib\net462\PocketCsvReader.dll ..\packages\Sprache.2.3.1\lib\net45\Sprache.dll @@ -96,13 +93,20 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net462\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -843,6 +847,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + \ No newline at end of file diff --git a/NBi.Testing/app.config b/NBi.Testing/app.config index 183ae931b..1e1be388e 100644 --- a/NBi.Testing/app.config +++ b/NBi.Testing/app.config @@ -20,11 +20,11 @@ - + - + @@ -34,6 +34,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.Testing/packages.config b/NBi.Testing/packages.config index b4a5fe54a..19b41ef54 100644 --- a/NBi.Testing/packages.config +++ b/NBi.Testing/packages.config @@ -1,19 +1,19 @@  - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NBi.UI.Genbi/App.config b/NBi.UI.Genbi/App.config index c87ad1917..8f65f5a17 100644 --- a/NBi.UI.Genbi/App.config +++ b/NBi.UI.Genbi/App.config @@ -7,7 +7,7 @@ - + @@ -15,12 +15,32 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.UI.Genbi/Command/Macro/PlayMacroCommand.cs b/NBi.UI.Genbi/Command/Macro/PlayMacroCommand.cs index abbc62ee2..6567d7502 100644 --- a/NBi.UI.Genbi/Command/Macro/PlayMacroCommand.cs +++ b/NBi.UI.Genbi/Command/Macro/PlayMacroCommand.cs @@ -1,8 +1,10 @@ using System; +using System.IO; using System.Linq; using System.Windows.Forms; using NBi.GenbiL; using NBi.UI.Genbi.View.TestSuiteGenerator; +using static System.Net.Mime.MediaTypeNames; namespace NBi.UI.Genbi.Command.Macro { @@ -73,8 +75,10 @@ public void ExecuteQuiet(string filename) generator.Load(filename); generator.Execute(); } - catch + catch (Exception ex) { + File.WriteAllText("error.txt", String.Format("Exception generated during execution of the macro.\r\n\r\n{0}", ex.Message)); + File.AppendAllText("error.txt", String.Format("\nInner Exception.\r\n\r\n{0}", ex.InnerException)); return; } } diff --git a/NBi.UI.Genbi/NBi.UI.Genbi.csproj b/NBi.UI.Genbi/NBi.UI.Genbi.csproj index 6f9239c0c..f5b70c464 100644 --- a/NBi.UI.Genbi/NBi.UI.Genbi.csproj +++ b/NBi.UI.Genbi/NBi.UI.Genbi.csproj @@ -9,7 +9,7 @@ Properties NBi.UI.Genbi Genbi - v4.6.1 + v4.6.2 512 diff --git a/NBi.UI.Genbi/packages.config b/NBi.UI.Genbi/packages.config index 54c3d95ce..5268df024 100644 --- a/NBi.UI.Genbi/packages.config +++ b/NBi.UI.Genbi/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/NBi.Xml/NBi.Xml.csproj b/NBi.Xml/NBi.Xml.csproj index d0a646300..d464fc81f 100644 --- a/NBi.Xml/NBi.Xml.csproj +++ b/NBi.Xml/NBi.Xml.csproj @@ -10,7 +10,7 @@ Properties NBi.Xml NBi.Xml - v4.6.1 + v4.6.2 512 diff --git a/NBi.Xml/app.config b/NBi.Xml/app.config index 48e3e9e22..1a54943ba 100644 --- a/NBi.Xml/app.config +++ b/NBi.Xml/app.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.Xml/packages.config b/NBi.Xml/packages.config index e4441f1e4..3385a0cba 100644 --- a/NBi.Xml/packages.config +++ b/NBi.Xml/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/NBi.Xsd.Preprocess/NBi.Xsd.Preprocess.csproj b/NBi.Xsd.Preprocess/NBi.Xsd.Preprocess.csproj index e23c52e58..d84b9dd3f 100644 --- a/NBi.Xsd.Preprocess/NBi.Xsd.Preprocess.csproj +++ b/NBi.Xsd.Preprocess/NBi.Xsd.Preprocess.csproj @@ -9,7 +9,7 @@ Properties NBi.Xsd.Preprocess NBi.Xsd.Preprocess - v4.6.1 + v4.6.2 512 diff --git a/NBi.Xsd.Preprocess/app.config b/NBi.Xsd.Preprocess/app.config index f8f1a7778..a0d55ef4e 100644 --- a/NBi.Xsd.Preprocess/app.config +++ b/NBi.Xsd.Preprocess/app.config @@ -5,7 +5,7 @@ - + @@ -13,12 +13,32 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.genbiL/NBi.genbiL.csproj b/NBi.genbiL/NBi.genbiL.csproj index 4a320efc6..cd0aef2b7 100644 --- a/NBi.genbiL/NBi.genbiL.csproj +++ b/NBi.genbiL/NBi.genbiL.csproj @@ -9,7 +9,7 @@ Properties NBi.GenbiL NBi.GenbiL - v4.6.1 + v4.6.2 512 ..\ diff --git a/NBi.genbiL/app.config b/NBi.genbiL/app.config index 48e3e9e22..1a54943ba 100644 --- a/NBi.genbiL/app.config +++ b/NBi.genbiL/app.config @@ -4,7 +4,7 @@ - + @@ -12,7 +12,27 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/NBi.genbiL/packages.config b/NBi.genbiL/packages.config index c17487bab..44491562e 100644 --- a/NBi.genbiL/packages.config +++ b/NBi.genbiL/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/NBi.sln b/NBi.sln index 67c27468c..68c7bd99d 100644 --- a/NBi.sln +++ b/NBi.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 14.0.22823.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBi.Core", "NBi.Core\NBi.Core.csproj", "{3F730647-FE31-4907-8A6E-A0C4A0C970EA}" EndProject diff --git a/Readme.md b/Readme.md index 9d4c7966a..f461f9489 100644 --- a/Readme.md +++ b/Readme.md @@ -10,21 +10,21 @@ The main goal of this framework is to let users create tests with a declarative **Releases:** [![nuget](https://img.shields.io/nuget/v/NBi.Framework.svg)](https://www.nuget.org/packages/NBi.Framework/) [![GitHub Release Date](https://img.shields.io/github/release-date/seddryck/nbi.svg)](https://github.com/Seddryck/NBi/releases/latest) [![licence badge](https://img.shields.io/badge/License-Apache%202.0-yellow.svg)](https://github.com/Seddryck/NBi/blob/master/LICENSE) - [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FSeddryck%2FNBi.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FSeddryck%2FNBi?ref=badge_shield) +[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FSeddryck%2FNBi.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FSeddryck%2FNBi?ref=badge_shield) **Latest RC and beta:** [![Pre-release](https://img.shields.io/github/tag-pre/seddryck/nbi.svg?color=%23ee41f4&label=Pre-release)](https://github.com/Seddryck/NBi/releases/) ![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/Seddryck/NBi?label=Pre-release) [![nuget](https://img.shields.io/nuget/vpre/NBi.Framework.svg?color=%23427682&label=Beta)](https://www.nuget.org/packages/NBi.Framework/) **Dev. activity:** [![GitHub last commit](https://img.shields.io/github/last-commit/Seddryck/nbi.svg)](https://github.com/Seddryck/NBi/releases/latest) -![Still maintained](https://img.shields.io/maintenance/yes/2021.svg) +![Still maintained](https://img.shields.io/maintenance/yes/2023.svg) ![GitHub commits since tagged version](https://img.shields.io/github/commits-since/Seddryck/NBi/v1.21/develop) ![GitHub commits on v2.0](https://img.shields.io/github/commits-since/seddryck/nbi/v1.21/develop_v2?label=commits%20on%20v2.0) ![GitHub commit activity](https://img.shields.io/github/commit-activity/y/Seddryck/NBi) **Continuous integration builds:** [![Build status](https://ci.appveyor.com/api/projects/status/t5m0hr57vnsdv0v7?svg=true)](https://ci.appveyor.com/project/Seddryck/nbi) -[![Build Status](https://seddryck.visualstudio.com/NBi/_apis/build/status/NBi-CI?branchName=develop)](https://seddryck.visualstudio.com/NBi/_apis/build/status/NBi-CI?branchName=develop) [![Tests](https://img.shields.io/appveyor/tests/seddryck/nbi.svg)](https://ci.appveyor.com/project/Seddryck/nbi/build/tests) +[![CodeFactor](https://www.codefactor.io/repository/github/seddryck/nbi/badge)](https://www.codefactor.io/repository/github/seddryck/nbi) **Status:** [![stars badge](https://img.shields.io/github/stars/Seddryck/NBi.svg)](https://github.com/Seddryck/NBi/stargazers) [![Bugs badge](https://img.shields.io/github/issues/Seddryck/NBi/bug.svg?color=red&label=Bugs)](https://github.com/Seddryck/NBi/issues?utf8=%E2%9C%93&q=is:issue+is:open+label:bug+) diff --git a/appveyor.yml b/appveyor.yml index 19b21d731..ee6189908 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,14 @@ version: build.{build} -image: Visual Studio 2017 +image: Visual Studio 2022 init: - cmd: git config --global core.autocrlf true -install: - - ps: .\restore-database-for-testing.ps1 + - ps: $env:IGNORE_NORMALISATION_GIT_HEAD_MOVE = 1 + before_build: - cmd: >- gitversion /l console /output buildserver /updateAssemblyInfo /verbosity Minimal - nuget restore + nuget restore -Verbosity quiet build: verbosity: minimal before_package: @@ -18,6 +18,10 @@ after_build: $nuget_version = "$env:GitVersion_NuGetVersionV2" .\.packages\package-NBi.ps1 $nuget_version + +before_test: + - ps: .\restore-database-for-testing.ps1 + test_script: - cmd: >- nunit3-console NBi.Testing.Core\bin\debug\NBi.Testing.Core.dll NBi.Testing.Framework\bin\debug\NBi.Testing.Framework.dll NBi.Testing.GenbiL\bin\debug\NBi.Testing.GenbiL.dll NBi.Testing.Xml\bin\debug\NBi.Testing.Xml.dll --where "cat!=Acceptance and cat!=Olap and cat!=Etl and cat!=WindowsService and cat!=ReportServerDB and cat!=LocalSQL" --result=myresults.xml;format=AppVeyor @@ -36,20 +40,14 @@ artifacts: deploy: - provider: NuGet api_key: - secure: t7JvzzVXlMoVuWTv1GNr11HcGHylr2xt9c0iFimeURp27wmzXg3R4TwW57huAmIf + secure: O0hLRt0g8WWz1ltyvA5FsC0ZRrfYvAtCp79d9WbkKvEGLC3up1N+1sv42J1SCSDg on: branch: develop - provider: NuGet api_key: - secure: t7JvzzVXlMoVuWTv1GNr11HcGHylr2xt9c0iFimeURp27wmzXg3R4TwW57huAmIf + secure: O0hLRt0g8WWz1ltyvA5FsC0ZRrfYvAtCp79d9WbkKvEGLC3up1N+1sv42J1SCSDg on: APPVEYOR_REPO_TAG: true -- provider: NuGet - server: https://www.myget.org/F/nbi-framework/api/v2/package - api_key: - secure: +E89GuWTCkM1DpiRGoO3oRLIvLIjb8aPsHqNvga0ID/xdUx0cvDjI7XVdF12rmEm - on: - branch: /^(develop|feature\/.+|hotfix\/.+)$/ - provider: NuGet server: https://nuget.pkg.github.com/Seddryck/index.json username: Seddryck diff --git a/librairies/MarkdownLog.dll b/librairies/MarkdownLog.dll new file mode 100644 index 000000000..dd582a29a Binary files /dev/null and b/librairies/MarkdownLog.dll differ diff --git a/restore-database-for-testing.ps1 b/restore-database-for-testing.ps1 index 3bf0516a5..4492bd16b 100644 --- a/restore-database-for-testing.ps1 +++ b/restore-database-for-testing.ps1 @@ -23,5 +23,9 @@ else Write-Host "Module dbatools installed" } +Write-Host "Switching default SQL Server connection encryption ..." +Set-DbatoolsConfig -FullName sql.connection.trustcert -Value $true +Set-DbatoolsConfig -FullName sql.connection.encrypt -Value $false + Write-Host "Restoring AdventureWorks$mssqlVersion on $env:computername\SQL$mssqlVersion ..." Restore-DbaDatabase -SqlInstance $env:computername\SQL$mssqlVersion -Path c:\projects\AdventureWorks$mssqlVersion.bak \ No newline at end of file