Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand All @@ -23,9 +23,9 @@ jobs:
cache-dependency-path: |
SQLSchemaCompare/yarn.lock
SQLSchemaCompare.UI/yarn.lock
- name: Restore dependencies
run: dotnet restore --locked-mode

- name: Restore win-x64 dependencies
run: dotnet restore --locked-mode -r win-x64
- name: Build win-x64
run: dotnet build --no-restore SQLSchemaCompare.UI -r win-x64 -c Release
- name: Publish win-x64
Expand All @@ -38,8 +38,6 @@ jobs:
if-no-files-found: 'error'
include-hidden-files: true

- name: Restore linux-x64 dependencies
run: dotnet restore --locked-mode -r linux-x64
- name: Build linux-x64
run: dotnet build --no-restore SQLSchemaCompare.UI -r linux-x64 -c Release
- name: Publish linux-x64
Expand All @@ -52,8 +50,6 @@ jobs:
if-no-files-found: 'error'
include-hidden-files: true

- name: Restore osx-x64 dependencies
run: dotnet restore --locked-mode -r osx-x64
- name: Build osx-x64
run: dotnet build --no-restore SQLSchemaCompare.UI -r osx-x64 -c Release
- name: Publish osx-x64
Expand All @@ -66,8 +62,6 @@ jobs:
if-no-files-found: 'error'
include-hidden-files: true

- name: Restore osx-arm64 dependencies
run: dotnet restore --locked-mode -r osx-arm64
- name: Build osx-arm64
run: dotnet build --no-restore SQLSchemaCompare.UI -r osx-arm64 -c Release
- name: Publish osx-arm64
Expand Down Expand Up @@ -258,16 +252,13 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4
- name: Build and push
uses: docker/build-push-action@v7
with:
context: .
file: ./SQLSchemaCompare.CLI/Dockerfile
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
push: ${{ github.event_name == 'push' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: '10.0.2xx'
dotnet-version: '10.0.3xx'
- name: Setup Node.js
uses: actions/setup-node@v6
with:
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<RuntimeIdentifiers>win-x64;linux-x64;linux-musl-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
<Product>SQL Schema Compare</Product>
<Description>https://github.com/TiCodeX/SQLSchemaCompare</Description>
<Authors>TiCodeX</Authors>
Expand Down
9 changes: 3 additions & 6 deletions SQLSchemaCompare.CLI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,18 @@ COPY ["SQLSchemaCompare.Infrastructure/SQLSchemaCompare.Infrastructure.csproj",
COPY ["SQLSchemaCompare.CLI/SQLSchemaCompare.CLI.csproj", "SQLSchemaCompare.CLI/"]

# restore the projects (this will be very fast with layer caching if the csproj files haven't changed)
RUN dotnet restore --locked-mode -r linux-musl-x64 SQLSchemaCompare.Core
RUN dotnet restore --locked-mode -r linux-musl-x64 SQLSchemaCompare.Services
RUN dotnet restore --locked-mode -r linux-musl-x64 SQLSchemaCompare.Infrastructure
RUN dotnet restore --locked-mode -r linux-musl-x64 SQLSchemaCompare.CLI
RUN dotnet restore --locked-mode SQLSchemaCompare.CLI

# Copy the rest of the code (we only copy the necessary files to make good use of layer caching)
COPY SQLSchemaCompare.Core/ SQLSchemaCompare.Core
COPY SQLSchemaCompare.Services/ SQLSchemaCompare.Services
COPY SQLSchemaCompare.Infrastructure/ SQLSchemaCompare.Infrastructure
COPY SQLSchemaCompare.CLI/ SQLSchemaCompare.CLI

RUN dotnet build --no-restore SQLSchemaCompare.CLI -c Release
RUN dotnet build --no-restore SQLSchemaCompare.CLI -r linux-musl-x64 -c Release

FROM build AS publish
RUN dotnet publish --no-restore --no-build SQLSchemaCompare.CLI -c Release -o /app/publish
RUN dotnet publish --no-restore --no-build SQLSchemaCompare.CLI -r linux-musl-x64 -c Release -o /app/publish

FROM base AS final
COPY --from=publish /app/publish .
Expand Down
1 change: 0 additions & 1 deletion SQLSchemaCompare.CLI/SQLSchemaCompare.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<AssemblyName>TiCodeX.SQLSchemaCompare.CLI</AssemblyName>
<RootNamespace>TiCodeX.SQLSchemaCompare.CLI</RootNamespace>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
<PublishDir>..\.publish</PublishDir>
<SelfContained>true</SelfContained>
</PropertyGroup>
Expand Down
34 changes: 34 additions & 0 deletions SQLSchemaCompare.CLI/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,40 @@
}
}
},
"net10.0/linux-musl-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
},
"net10.0/linux-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
Expand Down
7 changes: 6 additions & 1 deletion SQLSchemaCompare.Core/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
"resolved": "1.2.0.556",
"contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ=="
}
}
},
"net10.0/linux-musl-x64": {},
"net10.0/linux-x64": {},
"net10.0/osx-arm64": {},
"net10.0/osx-x64": {},
"net10.0/win-x64": {}
}
}
170 changes: 170 additions & 0 deletions SQLSchemaCompare.Infrastructure/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,176 @@
"TiCodeX.SQLSchemaCompare.Core": "[2026.5.1, )"
}
}
},
"net10.0/linux-musl-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
},
"net10.0/linux-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
},
"net10.0/osx-arm64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
},
"net10.0/osx-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
},
"net10.0/win-x64": {
"Microsoft.Data.SqlClient": {
"type": "Transitive",
"resolved": "6.1.1",
"contentHash": "syGQmIUPAYYHAHyTD8FCkTNThpQWvoA7crnIQRMfp8dyB5A2cWU3fQexlRTFkVmV7S0TjVmthi0LJEFVjHo8AQ==",
"dependencies": {
"Azure.Core": "1.47.1",
"Azure.Identity": "1.14.2",
"Microsoft.Bcl.Cryptography": "9.0.4",
"Microsoft.Data.SqlClient.SNI.runtime": "6.0.2",
"Microsoft.Extensions.Caching.Memory": "9.0.4",
"Microsoft.IdentityModel.JsonWebTokens": "7.7.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1",
"Microsoft.SqlServer.Server": "1.0.0",
"System.Configuration.ConfigurationManager": "9.0.4",
"System.Security.Cryptography.Pkcs": "9.0.4"
}
},
"Microsoft.Data.SqlClient.SNI.runtime": {
"type": "Transitive",
"resolved": "6.0.2",
"contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w=="
},
"System.Diagnostics.EventLog": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "getRQEXD8idlpb1KW56XuxImMy0FKp2WJPDf3Qr0kI/QKxxJSftqfDFVo0DZ3HCJRLU73qHSruv5q2l5O47jQQ=="
},
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "9.0.4",
"contentHash": "cUFTcMlz/Qw9s90b2wnWSCvHdjv51Bau9FQqhsr4TlwSe1OX+7SoXUqphis5G74MLOvMOCghxPPlEqOdCrVVGA=="
}
}
}
}
7 changes: 6 additions & 1 deletion SQLSchemaCompare.Services/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
"System.ComponentModel.Annotations": "[5.0.0, )"
}
}
}
},
"net10.0/linux-musl-x64": {},
"net10.0/linux-x64": {},
"net10.0/osx-arm64": {},
"net10.0/osx-x64": {},
"net10.0/win-x64": {}
}
}
Loading
Loading