Skip to content

Commit

Permalink
Merge dev into master for v2.3.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
cgillum authored Aug 25, 2020
2 parents f51bbc0 + ef75195 commit 7deb6d0
Show file tree
Hide file tree
Showing 109 changed files with 4,920 additions and 3,649 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,5 @@ __pycache__/
# Functions Click
functions-extensions/

.vscode/
.vscode/
.ionide/
4 changes: 2 additions & 2 deletions samples/VSSample.Tests/VSSample.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="Moq" Version="4.8.1" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
2 changes: 1 addition & 1 deletion samples/csx/extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DefaultItemExcludes>**</DefaultItemExcludes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.1.1" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.10" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Twilio" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.1.0" />
Expand Down
4 changes: 4 additions & 0 deletions samples/csx/host.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"version": "2.0",
"logging": {
"logLevel": {
"DurableTask.AzureStorage": "Warning",
"DurableTask.Core": "Warning"
},
"applicationInsights": {
"samplingSettings": {
"isEnabled": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
</PropertyGroup>
<ItemGroup>
<None Include="..\README.md" Link="README.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.29" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.*" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
4 changes: 4 additions & 0 deletions samples/entitites-csharp/Chirper/Chirper.Service/host.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"version": "2.0",
"logging": {
"logLevel": {
"DurableTask.AzureStorage": "Warning",
"DurableTask.Core": "Warning"
},
"applicationInsights": {
"samplingSettings": {
"isEnabled": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<None Include="..\README.md" Link="README.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.29" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.*" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
6 changes: 5 additions & 1 deletion samples/entitites-csharp/RideSharing/RideSharing/host.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"version": "2.0",
"logging": {
"logLevel": {
"DurableTask.AzureStorage": "Warning",
"DurableTask.Core": "Warning"
},
"applicationInsights": {
"sampling": {
"samplingSettings": {
"isEnabled": false
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/fsharp/DurableFSharp.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<ItemGroup>
<PackageReference Include="TaskBuilder.fs" Version="1.0.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.10" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Twilio" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.29" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions samples/fsharp/host.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"version": "2.0",
"logging": {
"logLevel": {
"DurableTask.AzureStorage": "Warning",
"DurableTask.Core": "Warning"
},
"applicationInsights": {
"samplingSettings": {
"isEnabled": false
Expand Down
2 changes: 1 addition & 1 deletion samples/javascript/extensions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DefaultItemExcludes>**</DefaultItemExcludes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.2.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.3.*" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.10" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Twilio" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.0.1" />
Expand Down
4 changes: 4 additions & 0 deletions samples/javascript/host.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"version": "2.0",
"logging": {
"logLevel": {
"DurableTask.AzureStorage": "Warning",
"DurableTask.Core": "Warning"
},
"applicationInsights": {
"samplingSettings": {
"isEnabled": false
Expand Down
Loading

0 comments on commit 7deb6d0

Please sign in to comment.