Skip to content

Commit b3171df

Browse files
markjbrownmarkjbrown
authored
Merge pull request #172 from AzureCosmosDB/feature/net8
Update all projects to .NET 8 framework and many Nuget refs to recent packages
2 parents 97f58b2 + 771d9cf commit b3171df

File tree

42 files changed

+275
-166
lines changed

Some content is hidden

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

42 files changed

+275
-166
lines changed

‎.github/workflows/deploy_tool_nupkg.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
name: Create dotnet tool NuGet package
99
runs-on: ubuntu-latest
10-
container: mcr.microsoft.com/dotnet/sdk:6.0
10+
container: mcr.microsoft.com/dotnet/sdk:8.0
1111
steps:
1212
- name: Check out repository
1313
uses: actions/checkout@v3

‎.github/workflows/dotnet-build-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
build:
1111
name: Build and test .NET projects
1212
runs-on: ubuntu-latest
13-
container: mcr.microsoft.com/dotnet/sdk:6.0
13+
container: mcr.microsoft.com/dotnet/sdk:8.0
1414
steps:
1515
- uses: actions/checkout@v3
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v2
1818
with:
19-
dotnet-version: 6.0.x
19+
dotnet-version: 8.0.x
2020
- name: Restore dependencies
2121
run: dotnet restore
2222
- name: Build
@@ -28,4 +28,4 @@ jobs:
2828
uses: actions/upload-artifact@v4
2929
with:
3030
name: debug-build
31-
path: /home/runner/work/data-migration-desktop-tool/data-migration-desktop-tool/Core/Cosmos.DataTransfer.Core/bin/Debug/net6.0 #path/to/artifact/ # or path/to/artifact
31+
path: /home/runner/work/data-migration-desktop-tool/data-migration-desktop-tool/Core/Cosmos.DataTransfer.Core/bin/Debug/net8.0 #path/to/artifact/ # or path/to/artifact

‎.github/workflows/internal-test-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-package:
1010
name: Build self-contained executables
1111
runs-on: ubuntu-latest
12-
container: mcr.microsoft.com/dotnet/sdk:6.0
12+
container: mcr.microsoft.com/dotnet/sdk:8.0
1313
steps:
1414
- name: Check .NET version
1515
run: dotnet --version

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
build-package:
4545
name: Build self-contained executables
4646
runs-on: ubuntu-latest
47-
container: mcr.microsoft.com/dotnet/sdk:6.0
47+
container: mcr.microsoft.com/dotnet/sdk:8.0
4848
steps:
4949
- name: Check .NET version
5050
run: dotnet --version

‎.github/workflows/validate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build-test:
99
name: Build and test .NET projects
1010
runs-on: ubuntu-latest
11-
container: mcr.microsoft.com/dotnet/sdk:6.0
11+
container: mcr.microsoft.com/dotnet/sdk:8.0
1212
steps:
1313
- name: Check .NET version
1414
run: dotnet --version

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
12-
<PackageReference Include="Moq" Version="4.18.4" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
14-
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
15-
<PackageReference Include="coverlet.collector" Version="3.1.2">
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="Moq" />
13+
<PackageReference Include="MSTest.TestAdapter" />
14+
<PackageReference Include="MSTest.TestFramework" />
15+
<PackageReference Include="coverlet.collector">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19+
<PackageReference Include="Newtonsoft.Json" />
20+
<PackageReference Include="System.Text.Json" />
1921
</ItemGroup>
2022

2123
<ItemGroup>

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<UserSecretsId>c7432a3a-5dc1-4e86-a1f0-b2363bf5c77f</UserSecretsId>
@@ -19,16 +19,17 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
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" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
28-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
29-
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
30-
<PackageReference Include="System.ComponentModel.Composition" Version="7.0.0" />
31-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
22+
<PackageReference Include="Azure.Core" />
23+
<PackageReference Include="Azure.Identity" />
24+
<PackageReference Include="Microsoft.Data.SqlClient" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
28+
<PackageReference Include="System.CommandLine" />
29+
<PackageReference Include="System.CommandLine.Hosting" />
30+
<PackageReference Include="System.ComponentModel.Composition" />
31+
<PackageReference Include="System.Configuration.ConfigurationManager" />
32+
<PackageReference Include="System.Text.Json" />
3233
</ItemGroup>
3334

3435
<ItemGroup>

‎CosmosDbDataMigrationTool.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ EndProject
9595
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BCBBAF22-0CB5-416B-8C80-03AB2FC4D0A0}"
9696
ProjectSection(SolutionItems) = preProject
9797
Contributing.md = Contributing.md
98+
Directory.Packages.props = Directory.Packages.props
9899
ExampleConfigs.md = ExampleConfigs.md
99100
README.md = README.md
100101
EndProjectSection

‎Directory.Packages.props‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.9" />
7+
<PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
8+
<PackageVersion Include="Azure.Core" Version="1.45.0" />
9+
<PackageVersion Include="Azure.Data.Tables" Version="12.10.0" />
10+
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
11+
<PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
12+
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
13+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
14+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
15+
<PackageVersion Include="CsvHelper" Version="33.0.1" />
16+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.46.1" />
17+
<PackageVersion Include="Microsoft.Azure.Cosmos.Encryption" Version="2.0.4" />
18+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
19+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
22+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
23+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
24+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
25+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
27+
<PackageVersion Include="MongoDB.Driver" Version="2.30.0" />
28+
<PackageVersion Include="Moq" Version="4.18.4" />
29+
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.2" />
30+
<PackageVersion Include="MSTest.TestFramework" Version="3.6.2" />
31+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
32+
<PackageVersion Include="Npgsql" Version="8.0.5" />
33+
<PackageVersion Include="Parquet.Net" Version="4.25.0" />
34+
<PackageVersion Include="Polly" Version="7.2.3" />
35+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
36+
<PackageVersion Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
37+
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
38+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
39+
<PackageVersion Include="System.Interactive.Async" Version="6.0.1" />
40+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
41+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
42+
</ItemGroup>
43+
</Project>

‎Extensions/AwsS3/Cosmos.DataTransfer.AwsS3Storage/Cosmos.DataTransfer.AwsS3Storage.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
11-
<PackageReference Include="AWSSDK.S3" Version="3.7.104" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
11+
<PackageReference Include="AWSSDK.S3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)