diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 4ef3aeaae..ae8e87e8b 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -20,52 +20,34 @@ on: inputs: {} jobs: - build: - name: Build DACPAC - runs-on: windows-2022 - env: - NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages + validate: + name: Validate + runs-on: ubuntu-22.04 steps: + - name: Checkout repo + uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.5.2 + - name: Set up dotnet - uses: actions/setup-dotnet@9211491ffb35dd6a6657ca4f45d43dfe6e97c829 + uses: actions/setup-dotnet@9211491ffb35dd6a6657ca4f45d43dfe6e97c829 # v3.0.3 with: dotnet-version: '6.0.x' - - name: Set up MSBuild - uses: microsoft/setup-msbuild@ab534842b4bdf384b8aaf93765dc6f721d9f5fab - + - name: Print environment run: | dotnet --info - msbuild -version nuget help | grep Version echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" - - name: Checkout repo - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 - - name: Build DACPAC - run: msbuild src/Sql/Sql.sqlproj /p:Configuration=Release /verbosity:minimal + run: dotnet build src/Sql --configuration Release --verbosity minimal --output . shell: pwsh - name: Upload DACPAC - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 - with: - name: sql.dacpac - path: src/Sql/bin/Release/Sql.dacpac - - validate: - name: Validate - runs-on: ubuntu-20.04 - needs: build - steps: - - name: Checkout repo - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 - - - name: Download dacpac - uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 + uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.1.2 with: name: sql.dacpac + path: Sql.dacpac - name: Docker Compose up working-directory: "dev" @@ -88,7 +70,7 @@ jobs: shell: pwsh - name: Upload Report - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 + uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v3.1.2 with: name: report.xml path: | diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj index bdc16b896..09f8ecedd 100644 --- a/src/Sql/Sql.sqlproj +++ b/src/Sql/Sql.sqlproj @@ -1,500 +1,13 @@  - - + + - Debug - AnyCPU Sql - 2.0 - 4.1 {58554e52-fdec-4832-aff9-302b01e08dca} Microsoft.Data.Tools.Schema.Sql.SqlAzureV12DatabaseSchemaProvider - Database - - - Sql - Sql 1033,CI - BySchemaAndSchemaType - True - v4.8 - CS - Properties - False - True - True - SQL_Latin1_General_CP1_CI_AS - PRIMARY - - bin\Release\ - $(MSBuildProjectName).sql - False - pdbonly - true - false - true - prompt - 4 - 71502 - - - bin\Debug\ - $(MSBuildProjectName).sql - false - true - full - false - true - true - prompt - 4 - 71502 - - - 12.0 - - True - 12.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/Sql/dbo/Stored Procedures/OrganizationDomain_Update.sql b/src/Sql/dbo/Stored Procedures/OrganizationDomain_Update.sql index 7318f9afb..a10be1f16 100644 --- a/src/Sql/dbo/Stored Procedures/OrganizationDomain_Update.sql +++ b/src/Sql/dbo/Stored Procedures/OrganizationDomain_Update.sql @@ -20,9 +20,9 @@ BEGIN [DomainName] = @DomainName, [CreationDate] = @CreationDate, [VerifiedDate] = @VerifiedDate, - [LastCheckedDate] = @LastCheckedDate + [LastCheckedDate] = @LastCheckedDate, [NextRunDate] = @NextRunDate, [JobRunCount] = @JobRunCount WHERE [Id] = @Id -END \ No newline at end of file +END diff --git a/src/Sql/packages.lock.json b/src/Sql/packages.lock.json new file mode 100644 index 000000000..52feb4e4d --- /dev/null +++ b/src/Sql/packages.lock.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.6": { + "Microsoft.NETFramework.ReferenceAssemblies": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "7D2TMufjGiowmt0E941kVoTIS+GTNzaPopuzM1/1LSaJAdJdBrVP0SkZW7AgDd0a2U1DjsIeaKG1wxGVBNLDMw==", + "dependencies": { + "Microsoft.NETFramework.ReferenceAssemblies.net46": "1.0.0" + } + }, + "Microsoft.NETFramework.ReferenceAssemblies.net46": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "Zhtz+rFItjyGS3jMl9F011VJYLKyW6hwEUMsH/KfM2w0YrxoeFc8gO9iaOxCdN+bJFs/p2a+kHF1vNJ4y2+LfQ==" + } + } + } +} \ No newline at end of file