Skip to content
Merged
22 changes: 22 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: 2
updates:
- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "weekly"
day: "tuesday"
ignore:
- dependency-name: "*"
update-types:
- "version-update:semver-major"

- package-ecosystem: "dotnet-sdk"
directory: "/"
schedule:
interval: "weekly"
day: "tuesday"
ignore:
- dependency-name: "*"
update-types:
- "version-update:semver-major"

18 changes: 9 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
<PackageVersion Include="Castle.Core" Version="5.0.0" />
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'" />
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472'" />
<PackageVersion Include="ImpromptuInterface" Version="7.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
Expand All @@ -35,8 +35,8 @@
<PackageVersion Include="System.Reactive.Core" Version="4.4.1" />
</ItemGroup>

<!-- Product dependencies with net462 only-->
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<!-- Product dependencies with net48 only-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="1.0.0" />
<PackageVersion Include="Microsoft.Data.Edm" Version="5.8.5" />
<PackageVersion Include="Microsoft.Data.OData" Version="5.8.5" />
Expand All @@ -49,7 +49,7 @@
<ItemGroup>
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.0.0-beta.4" />
<PackageVersion Include="CommandLineParser" Version="2.4.3" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net462'" />
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net48'" />
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.EventSourceAnalyzer.NetCore" Version="2.0.1406.4" />
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
<PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.5.6" />
Expand All @@ -62,7 +62,7 @@
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net462'" />
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>

<!-- Test dependencies with net6.0-->
Expand All @@ -78,8 +78,8 @@
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
</ItemGroup>

<!-- Test dependencies with net462-->
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<!-- Test dependencies with net48-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="EnterpriseLibrary.SemanticLogging" version="2.0.1406.1" />
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.TextFile" version="2.0.1406.1" />
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
Expand Down Expand Up @@ -114,8 +114,8 @@
</ItemGroup>


<!-- Samples dependencies with net462-->
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<!-- Samples dependencies with net48-->
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageVersion Include="ncrontab" version="1.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/DurableTask.Samples/DurableTask.Samples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net462;net472</TargetFrameworks>
<TargetFrameworks>net48;net472</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>Microsoft.Azure.DurableTask.AzureServiceFabric</PackageId>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand All @@ -16,7 +16,7 @@
<NoWarn>$(NoWarn);NU5104</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Web" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/DurableTask.Emulator/DurableTask.Emulator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
<PackageId>Microsoft.Azure.DurableTask.Emulator</PackageId>
<!--NuGet licenseUrl and PackageIconUrl/iconUrl deprecation. -->
<NoWarn>NU5125;NU5048</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
<PackageId>Microsoft.Azure.DurableTask.ServiceBus</PackageId>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
Expand All @@ -24,7 +24,7 @@
<Version>$(VersionPrefix)</Version>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="ImpromptuInterface" />
<PackageReference Include="Microsoft.Azure.KeyVault.Core" />
<PackageReference Include="Microsoft.Data.Edm" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net48</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net48</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace DurableTask.AzureStorage.Tests
using Moq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
#if !NET462
#if !NET48
using OpenTelemetry;
using OpenTelemetry.Trace;
#endif
Expand Down Expand Up @@ -1652,7 +1652,7 @@ public async Task LargeMessage_WithEscapedInstanceId_CanBeStoredAndFetchedSucces

// Use an instanceId that contains special characters which must be escaped in URIs
string id = "test|123:with white spcae";
var client = await host.StartOrchestrationAsync(typeof(Orchestrations.Echo), input:message, instanceId: id);
var client = await host.StartOrchestrationAsync(typeof(Orchestrations.Echo), input: message, instanceId: id);
var status = await client.WaitForCompletionAsync(TimeSpan.FromMinutes(2));

Assert.AreEqual(OrchestrationStatus.Completed, status?.OrchestrationStatus);
Expand Down Expand Up @@ -2633,7 +2633,7 @@ public async Task OrchestrationRejectsWithVersionMismatch()
}
}

#if !NET462
#if !NET48
/// <summary>
/// End-to-end test which validates a simple orchestrator function that calls an activity function
/// and checks the OpenTelemetry trace information
Expand Down Expand Up @@ -2687,7 +2687,7 @@ public async Task OpenTelemetry_SayHelloWithActivity(bool enableExtendedSessions
Assert.AreEqual(12, processor.Invocations.Count);

// Checking tag values
string activity2TypeValue = activity2.Tags.First(k => (k.Key).Equals("durabletask.type" )).Value;
string activity2TypeValue = activity2.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
string activity5TypeValue = activity5.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
string activity8TypeValue = activity8.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
string activity9TypeValue = activity9.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<!-- Increasing Azure.Monitor.OpenTelemetry.Exporter to 1.0.0-beta.5 or beyond brings Systems.DiagnosticSource 7.x, which is uncompatible with netcoreapp3.1.
The warning reads:
"System.Diagnostics.DiagnosticSource 7.0.0-rc.1.22426.10 doesn't support netcoreapp3.1 and has not been tested with it
Expand Down Expand Up @@ -43,7 +43,7 @@
<ProjectReference Include="..\DurableTask.Test.Orchestrations\DurableTask.Test.Orchestrations.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Configuration" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions test/DurableTask.Core.Tests/DispatcherMiddlewareTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// ----------------------------------------------------------------------------------
#if !NET462 // for some reasons these tests are not discoverable on 1ES, leading to the test getting aborted. TODO: Needs investigation
#if !NET48 // for some reasons these tests are not discoverable on 1ES, leading to the test getting aborted. TODO: Needs investigation
#nullable enable
namespace DurableTask.Core.Tests
{
Expand Down Expand Up @@ -263,7 +263,7 @@ public void EnsureOrchestrationExecutionContextSupportsDataContractSerialization
[TestMethod]
public async Task EnsureSubOrchestrationDispatcherMiddlewareHasAccessToRuntimeState()
{
ConcurrentBag<OrchestrationExecutionContext> capturedContexts = new ConcurrentBag<OrchestrationExecutionContext>();
ConcurrentBag<OrchestrationExecutionContext> capturedContexts = new ConcurrentBag<OrchestrationExecutionContext>();

for (var i = 0; i < 10; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion test/DurableTask.Core.Tests/DurableTask.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFramework>net451</TargetFramework>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net48'">
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="Azure.Data.Tables" />
<PackageReference Include="Azure.Storage.Blobs" />
<PackageReference Include="CommandLineParser" />
Expand Down Expand Up @@ -56,7 +56,7 @@
</None>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Configuration" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions test/DurableTask.Stress.Tests/DurableTask.Stress.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>net6.0;net462</TargetFrameworks>
<TargetFrameworks>net6.0;net48</TargetFrameworks>
<StartupObject>DurableTask.Stress.Tests.Program</StartupObject>
<ApplicationIcon />
<OutputType>Exe</OutputType>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net48'">
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<None Remove="eventFlowConfig.json" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<Content Include="eventFlowConfig.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<PackageReference Include="CommandLineParser" />
<PackageReference Include="Microsoft.Diagnostics.EventFlow.Core" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<PackageReference Include="CommandLineParser" />
<PackageReference Include="EnterpriseLibrary.SemanticLogging" />
<PackageReference Include="EnterpriseLibrary.SemanticLogging.TextFile" />
Expand All @@ -39,13 +39,13 @@
<ProjectReference Include="..\DurableTask.Test.Orchestrations\DurableTask.Test.Orchestrations.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<None Update="DurableTask.Stress.Tests.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Reference Include="System.Configuration" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462;net472</TargetFrameworks>
<TargetFrameworks>net48;net472</TargetFrameworks>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

Expand Down
Loading