Skip to content

Commit 0fb4379

Browse files
crpietschmanncrpietschmann
authored
Merge branch 'main' into feature/gui
2 parents 2d00135 + 6366f57 commit 0fb4379

File tree

60 files changed

+1677
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1677
-198
lines changed

‎.github/actions/build-with-plugins/action.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,23 @@ runs:
151151
-p:PublishReadyToRun=false \
152152
-p:PublishTrimmed=false \
153153
-p:Version=${{ inputs.build-version }}
154+
- name: Build PostgreSQL Extension
155+
shell: bash
156+
run: |
157+
dotnet publish \
158+
Extensions/PostgreSQL/Cosmos.DataTransfer.PostgresqlExtension.csproj \
159+
--configuration Release \
160+
--output ${{ inputs.platform-short }}/Extensions \
161+
--self-contained false \
162+
--runtime ${{ inputs.runtime }} \
163+
-p:PublishSingleFile=false \
164+
-p:DebugType=embedded \
165+
-p:EnableCompressionInSingleFile=true \
166+
-p:PublishReadyToRun=false \
167+
-p:PublishTrimmed=false \
168+
-p:Version=${{ inputs.build-version }}
154169
- name: Upload package
155-
uses: actions/upload-artifact@v3
170+
uses: actions/upload-artifact@v4
156171
with:
157172
name: ${{ inputs.platform }}-package
158173
path: ${{ inputs.platform-short }}/

‎.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

‎.github/workflows/release.yml

+32-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
name: Release desktop binaries
22
on:
3-
release:
4-
types:
5-
- published
3+
workflow_dispatch:
4+
inputs:
5+
release-tag:
6+
description: 'Version number to build and release'
7+
required: true
68
jobs:
79
github-release:
810
name: Create GitHub release
911
runs-on: ubuntu-latest
10-
needs: build-package-win
12+
needs: build-package
13+
permissions:
14+
contents: write
1115
steps:
1216
- name: Download Windows GUI x64 package
1317
uses: actions/download-artifact@v3
@@ -31,18 +35,19 @@ jobs:
3135
path: linux-package
3236
- name: Package output files
3337
run: |
34-
zip -r dmt-gui-${{ github.event.release.tag_name }}-win-x64.zip windows-gui-package/*
35-
zip -r dmt-${{ github.event.release.tag_name }}-win-x64.zip windows-package/*
36-
zip -r dmt-${{ github.event.release.tag_name }}-mac-x64.zip mac-package/*
37-
zip -r dmt-${{ github.event.release.tag_name }}-linux-x64.zip linux-package/*
38+
zip -r dmt-gui-${{ inputs.release-tag }}-win-x64.zip windows-gui-package/*
39+
zip -r dmt-${{ inputs.release-tag }}-win-x64.zip windows-package/*
40+
zip -r dmt-${{ inputs.release-tag }}-mac-x64.zip mac-package/*
41+
zip -r dmt-${{ inputs.release-tag }}-linux-x64.zip linux-package/*
3842
- name: Create GitHub release
3943
uses: softprops/action-gh-release@v1
4044
with:
45+
tag_name: ${{ inputs.release-tag }}
4146
files: |
42-
dmt-gui-${{ github.event.release.tag_name }}-win-x64.zip
43-
dmt-${{ github.event.release.tag_name }}-win-x64.zip
44-
dmt-${{ github.event.release.tag_name }}-mac-x64.zip
45-
dmt-${{ github.event.release.tag_name }}-linux-x64.zip
47+
dmt-gui-${{ inputs.release-tag }}-win-x64.zip
48+
dmt-${{ inputs.release-tag }}-win-x64.zip
49+
dmt-${{ inputs.release-tag }}-mac-x64.zip
50+
dmt-${{ inputs.release-tag }}-linux-x64.zip
4651
build-package:
4752
name: Build self-contained executables
4853
runs-on: ubuntu-latest
@@ -52,22 +57,30 @@ jobs:
5257
run: dotnet --version
5358
- name: Checkout source code
5459
uses: actions/checkout@v3
60+
- name: Execute Action build-with-plugins for Windows
61+
uses: ./.github/actions/build-with-plugins
62+
id: build-with-plugins-win
63+
with:
64+
platform: windows
65+
platform-short: win
66+
runtime: win-x64
67+
build-version: ${{ inputs.release-tag }}
5568
- name: Execute Action build-with-plugins for MacOS
5669
uses: ./.github/actions/build-with-plugins
5770
id: build-with-plugins-mac
5871
with:
5972
platform: mac
6073
platform-short: mac
6174
runtime: osx-x64
62-
build-version: ${{ github.event.release.tag_name }}
75+
build-version: ${{ inputs.release-tag }}
6376
- name: Execute Action build-with-plugins for Linux
6477
uses: ./.github/actions/build-with-plugins
6578
id: build-with-plugins-linux
6679
with:
6780
platform: linux
6881
platform-short: linux
6982
runtime: linux-x64
70-
build-version: ${{ github.event.release.tag_name }}
83+
build-version: ${{ inputs.release-tag }}
7184
build-package-win:
7285
name: Build self-contained Windows executables
7386
runs-on: windows-2022
@@ -88,7 +101,7 @@ jobs:
88101
platform: windows
89102
platform-short: win
90103
runtime: win-x64
91-
build-version: ${{ github.event.release.tag_name }}
104+
build-version: ${{ inputs.release-tag }}
92105
- name: Build Windows desktop package
93106
shell: bash
94107
run: |
@@ -102,9 +115,11 @@ jobs:
102115
-p:DebugType=embedded \
103116
-p:IncludeNativeLibrariesForSelfExtract=true \
104117
-p:EnableCompressionInSingleFile=true \
105-
-p:Version=${{ github.event.release.tag_name }}
118+
-p:Version=${{ inputs.release-tag }}
106119
- name: Upload gui package
107-
uses: actions/upload-artifact@v3
120+
uses: actions/upload-artifact@v4
108121
with:
109122
name: windows-gui-package
110123
path: win/
124+
build-version: ${{ inputs.release-tag }}
125+

‎Core/Cosmos.DataTransfer.Core/Cosmos.DataTransfer.Core.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Azure.Core" Version="1.31.0" />
23-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0" />
22+
<PackageReference Include="Azure.Core" Version="1.40.0" />
23+
<PackageReference Include="Azure.Identity" Version="1.12.0" />
24+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
2425
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
2526
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
2627
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
2728
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
2829
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
29-
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
30-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
30+
<PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
31+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
3132
</ItemGroup>
3233

3334
<ItemGroup>

‎Core/Cosmos.DataTransfer.Core/migrationsettings.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2-
"Source": null,
3-
"Sink": null,
4-
"SourceSettings": {
2+
"Source": "",
3+
"Sink": "",
4+
"SourceSettings": {
5+
56
},
6-
"SinkSettings": {
7+
"SinkSettings": {
8+
79
},
810
"Operations": [
911
//{

‎CosmosDbDataMigrationTool.sln

+24-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mongo", "Mongo", "{F18E789A
3939
Extensions\Mongo\README.md = Extensions\Mongo\README.md
4040
EndProjectSection
4141
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.MongoExtension", "Extensions\Mongo\Cosmos.DataTransfer.MongoExtension\Cosmos.DataTransfer.MongoExtension.csproj", "{F6EAC33B-9F7D-433B-9328-622FB8938C24}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.MongoVectorExtension", "Extensions\Mongo\Cosmos.DataTransfer.MongoVectorExtension\Cosmos.DataTransfer.MongoVectorExtension.csproj", "{F6EAC33B-9F7D-433B-9328-622FB8938C24}"
4343
EndProject
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.JsonExtension.UnitTests", "Extensions\Json\Cosmos.DataTransfer.JsonExtension.UnitTests\Cosmos.DataTransfer.JsonExtension.UnitTests.csproj", "{ED1E375E-A5A3-47EA-A7D5-07344C7E152F}"
4545
EndProject
@@ -64,6 +64,9 @@ EndProject
6464
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.Common", "Interfaces\Cosmos.DataTransfer.Common\Cosmos.DataTransfer.Common.csproj", "{0FAD9D89-2E41-4D65-8440-5C01885D9292}"
6565
EndProject
6666
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureBlob", "AzureBlob", "{9627A42A-BEB0-4A39-B49C-C3C6D54E705A}"
67+
ProjectSection(SolutionItems) = preProject
68+
Extensions\AzureBlob\README.md = Extensions\AzureBlob\README.md
69+
EndProjectSection
6770
EndProject
6871
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AwsS3", "AwsS3", "{502197E4-F554-4B5B-9235-FBFE7E49EBEF}"
6972
EndProject
@@ -96,6 +99,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
9699
README.md = README.md
97100
EndProjectSection
98101
EndProject
102+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.PostgresqlExtension", "Extensions\PostgreSQL\Cosmos.DataTransfer.PostgresqlExtension.csproj", "{85820167-DB94-458B-B09B-9E823996C692}"
103+
EndProject
104+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PostgreSQL", "PostgreSQL", "{1B927C5F-50FC-42A6-BAF6-B00E6D760543}"
105+
ProjectSection(SolutionItems) = preProject
106+
Extensions\PostgreSQL\README.md = Extensions\PostgreSQL\README.md
107+
EndProjectSection
108+
EndProject
109+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.DataTransfer.MongoExtension", "Extensions\Mongo\Cosmos.DataTransfer.MongoExtension\Cosmos.DataTransfer.MongoExtension.csproj", "{31BC84E1-55E5-45AA-BFAC-90732F20588B}"
110+
EndProject
99111
Global
100112
GlobalSection(SolutionConfigurationPlatforms) = preSolution
101113
Debug|Any CPU = Debug|Any CPU
@@ -182,6 +194,14 @@ Global
182194
{40AD8890-BD78-48F5-AE76-2C2FC6F15B7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
183195
{40AD8890-BD78-48F5-AE76-2C2FC6F15B7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
184196
{40AD8890-BD78-48F5-AE76-2C2FC6F15B7E}.Release|Any CPU.Build.0 = Release|Any CPU
197+
{85820167-DB94-458B-B09B-9E823996C692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198+
{85820167-DB94-458B-B09B-9E823996C692}.Debug|Any CPU.Build.0 = Debug|Any CPU
199+
{85820167-DB94-458B-B09B-9E823996C692}.Release|Any CPU.ActiveCfg = Release|Any CPU
200+
{85820167-DB94-458B-B09B-9E823996C692}.Release|Any CPU.Build.0 = Release|Any CPU
201+
{31BC84E1-55E5-45AA-BFAC-90732F20588B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
202+
{31BC84E1-55E5-45AA-BFAC-90732F20588B}.Debug|Any CPU.Build.0 = Debug|Any CPU
203+
{31BC84E1-55E5-45AA-BFAC-90732F20588B}.Release|Any CPU.ActiveCfg = Release|Any CPU
204+
{31BC84E1-55E5-45AA-BFAC-90732F20588B}.Release|Any CPU.Build.0 = Release|Any CPU
185205
EndGlobalSection
186206
GlobalSection(SolutionProperties) = preSolution
187207
HideSolutionNode = FALSE
@@ -213,6 +233,9 @@ Global
213233
{39930280-DA29-4814-837B-FA7F252EB3EC} = {A8A1CEAB-2D82-460C-9B86-74ABD17CD201}
214234
{6A3FB90C-B837-4724-A406-214D4CEA686F} = {39930280-DA29-4814-837B-FA7F252EB3EC}
215235
{40AD8890-BD78-48F5-AE76-2C2FC6F15B7E} = {39930280-DA29-4814-837B-FA7F252EB3EC}
236+
{85820167-DB94-458B-B09B-9E823996C692} = {1B927C5F-50FC-42A6-BAF6-B00E6D760543}
237+
{1B927C5F-50FC-42A6-BAF6-B00E6D760543} = {A8A1CEAB-2D82-460C-9B86-74ABD17CD201}
238+
{31BC84E1-55E5-45AA-BFAC-90732F20588B} = {F18E789A-D32D-48D3-B75F-1196D7215F74}
216239
EndGlobalSection
217240
GlobalSection(ExtensibilityGlobals) = postSolution
218241
SolutionGuid = {662B3F27-70D8-45E6-A1C0-1438A9C8A542}

0 commit comments

Comments
 (0)