Merge feature/entities to main (#180)

- Add support for durable entities
microsoft · Oct 18, 2023 · faa5fd1 · faa5fd1
1 parent 5522db3
commit faa5fd1
Show file tree

Hide file tree

Showing 66 changed files with 4,431 additions and 29 deletions.
diff --git a/.github/workflows/validate-build.yml b/.github/workflows/validate-build.yml
@@ -2,10 +2,14 @@ name: Validate Build
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'feature/**'
     paths-ignore: [ '**.md' ]
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 'feature/**'
     paths-ignore: [ '**.md' ]
 
 env:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "humao.rest-client",
+        "ms-dotnettools.csharp",
+        "ms-azuretools.vscode-azurefunctions"
+    ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "AzureFunctionsApp",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:azureFunctions.pickProcess}"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -9,17 +9,40 @@
         "args": [
           "build",
           "${workspaceRoot}/Microsoft.DurableTask.sln",
-          // Ask dotnet build to generate full paths for file names.
           "/property:GenerateFullPaths=true",
-          // Do not generate summary otherwise it leads to duplicate errors in Problems panel
           "/consoleloggerparameters:NoSummary"
         ],
         "label": "build",
-        "group": "build",
-        "presentation": {
-          "reveal": "silent"
+        "group": {
+          "kind": "build",
+          "isDefault": true
         },
         "problemMatcher": "$msCompile"
+      },
+      {
+        "label": "build (AzureFunctionsApp)",
+        "command": "dotnet",
+        "args": [
+          "build",
+          "${workspaceFolder}/samples/AzureFunctionsApp",
+          "/property:GenerateFullPaths=true",
+          "/consoleloggerparameters:NoSummary"
+        ],
+        "type": "shell",
+        "group": {
+          "kind": "build"
+        },
+        "problemMatcher": "$msCompile",
+      },
+      {
+        "type": "func",
+        "dependsOn": "build (AzureFunctionsApp)",
+        "options": {
+          "cwd": "${workspaceFolder}/out/samples/bin/Debug/AzureFunctionsApp/net6.0"
+        },
+        "command": "host start",
+        "isBackground": true,
+        "problemMatcher": "$func-dotnet-watch"
       }
     ]
   }
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -43,8 +43,8 @@ steps:
     command: restore
     verbosityRestore: Minimal
     projects: $(project)
-    selectOrConfig: config
-    nugetConfigPath: 'nuget.config'
+    feedsToUse: config
+    nugetConfigPath: nuget.config
 
 # Build source directory
 - task: DotNetCoreCLI@2

diff --git a/eng/proto b/eng/proto
diff --git a/eng/targets/Release.props b/eng/targets/Release.props
@@ -17,7 +17,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.5</VersionPrefix>
+    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionSuffix>preview.1</VersionSuffix>
   </PropertyGroup>
 
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,7 @@
   <packageSources>
     <clear/>
     <add key="durabletask" value="https://pkgs.dev.azure.com/durabletaskframework/734e7913-2fab-4624-a174-bc57fe96f95d/_packaging/durabletask/nuget/v3/index.json" />
+    <add key="AzureFunctionsTempStaging" value="https://pkgs.dev.azure.com/azfunc/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/samples/AzureFunctionsApp/AzureFunctionsApp.csproj b/samples/AzureFunctionsApp/AzureFunctionsApp.csproj
@@ -6,12 +6,12 @@
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.10.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" Version="1.1.0-entities-preview.3" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.7.0" OutputItemType="Analyzer" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.0-preview2" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
   </ItemGroup>