Skip to content

Commit 6c1392a

Browse files
paulyukpaulyuk
authored
Merge pull request #999 from dapr/release-1.13
Release 1.13 merge into main
2 parents ec1e515 + 97dc871 commit 6c1392a

File tree

107 files changed

+4566
-630
lines changed

Some content is hidden

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

107 files changed

+4566
-630
lines changed

‎.github/env/global.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
DAPR_CLI_VERSION: 1.12.0
2-
DAPR_RUNTIME_VERSION: 1.12.0
1+
DAPR_CLI_VERSION: 1.13.0
2+
DAPR_RUNTIME_VERSION: 1.13.0
33
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
44
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
55
MACOS_PYTHON_VERSION: 3.10

‎.github/workflows/dapr-bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
const commentBody = payload.comment.body;
3333
if (!isFromPulls && commentBody && commentBody.indexOf("/assign") == 0) {
3434
if (!issue.assignees || issue.assignees.length === 0) {
35-
await github.issues.addAssignees({
35+
await github.rest.issues.addAssignees({
3636
owner: issue.owner,
3737
repo: issue.repo,
3838
issue_number: issue.number,

‎.github/workflows/validate_csharp_quicstarts.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ jobs:
7979
uses: actions/setup-dotnet@v3
8080
with:
8181
dotnet-version: |
82-
7.0.x
82+
6.0.x
83+
8.0.x
8384
- name: Set up Dapr CLI - Mac/Linux
8485
if: matrix.os != 'windows-latest'
8586
run: wget -q ${{ env.DAPR_INSTALL_URL }}/install.sh -O - | /bin/bash -s ${{ env.DAPR_CLI_VERSION }}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ release.properties
1818
mvnw
1919
packages
2020
**/__pycache__/
21+
**/dist/
22+
Debug/
2123

2224
# IDE generated files and directories
2325
*.iml

‎actors/csharp/sdk/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ Run the `SmartDevice.Service`, which will start service itself and the Dapr side
3434
<!-- STEP
3535
name: Run actor service
3636
expected_stdout_lines:
37-
- "Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - - - 200"
37+
- "Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - 200"
3838
expected_stderr_lines:
39-
working_dir: ./service
39+
working_dir: .
4040
output_match_mode: substring
4141
background: true
4242
sleep: 30
4343
-->
4444
```bash
45-
cd actors/csharp/sdk/service
45+
cd service
4646
dapr run --app-id actorservice --app-port 5001 --app-protocol http --dapr-http-port 56001 --resources-path ../../../resources -- dotnet run --urls=http://localhost:5001/
4747
```
4848
<!-- END_STEP -->
@@ -70,13 +70,13 @@ name: Run actor client
7070
expected_stdout_lines:
7171
- "Device 2 state: Location: Second Floor, Status: Ready"
7272
expected_stderr_lines:
73-
working_dir: ./client
73+
working_dir: .
7474
output_match_mode: substring
7575
background: true
7676
sleep: 60
7777
-->
7878
```bash
79-
cd ./actors/csharp/sdk/client
79+
cd client
8080
dapr run --app-id actorclient -- dotnet run
8181
```
8282
<!-- END_STEP -->

‎actors/csharp/sdk/client/SmartDevice.Client.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<OutputType>Exe</OutputType>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.Actors" Version="1.12.*-*" />
11+
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj‎

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

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

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.12.*-*" />
10+
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
1111
</ItemGroup>
1212

1313
</Project>

‎actors/csharp/sdk/sdk.sln‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.002.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Service", "service\SmartDevice.Service.csproj", "{3E9760D4-A707-487F-8B73-3ECB080749C0}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Client", "client\SmartDevice.Client.csproj", "{044F6311-35DC-4A94-A99A-35CB59913AFF}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartDevice.Interfaces", "interfaces\SmartDevice.Interfaces.csproj", "{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}"
11+
EndProject
12+
Global
13+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14+
Debug|Any CPU = Debug|Any CPU
15+
Release|Any CPU = Release|Any CPU
16+
EndGlobalSection
17+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{3E9760D4-A707-487F-8B73-3ECB080749C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{3E9760D4-A707-487F-8B73-3ECB080749C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{3E9760D4-A707-487F-8B73-3ECB080749C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{3E9760D4-A707-487F-8B73-3ECB080749C0}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{044F6311-35DC-4A94-A99A-35CB59913AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{044F6311-35DC-4A94-A99A-35CB59913AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{044F6311-35DC-4A94-A99A-35CB59913AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{044F6311-35DC-4A94-A99A-35CB59913AFF}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{D5B9AFF1-D7F3-42E5-8E8E-06593F91323F}.Release|Any CPU.Build.0 = Release|Any CPU
30+
EndGlobalSection
31+
GlobalSection(SolutionProperties) = preSolution
32+
HideSolutionNode = FALSE
33+
EndGlobalSection
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {409D8B04-7025-42BC-BC2A-AF3F6A089623}
36+
EndGlobalSection
37+
EndGlobal

‎actors/csharp/sdk/service/SmartDevice.Service.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.Web">
22

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

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.12.*-*" />
11-
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.12.*-*" />
10+
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
11+
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.13.*-*" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎bindings/csharp/http/batch/batch.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
12-
</ItemGroup>
139

1410
</Project>

0 commit comments

Comments
 (0)