Skip to content

Commit 77b3763

Browse files
torosenttorosent
committed
Update target frameworks from net462 to net48 across multiple projects
1 parent 7334f1a commit 77b3763

File tree

15 files changed

+42
-42
lines changed

15 files changed

+42
-42
lines changed

‎Directory.Packages.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
1616
<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
1717
<PackageVersion Include="Castle.Core" Version="5.0.0" />
18-
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'" />
18+
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net48' OR '$(TargetFramework)' == 'net472'" />
1919
<PackageVersion Include="ImpromptuInterface" Version="7.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
2020
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
2121
<PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
@@ -35,8 +35,8 @@
3535
<PackageVersion Include="System.Reactive.Core" Version="4.4.1" />
3636
</ItemGroup>
3737

38-
<!-- Product dependencies with net462 only-->
39-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
38+
<!-- Product dependencies with net48 only-->
39+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
4040
<PackageVersion Include="Microsoft.Azure.KeyVault.Core" Version="1.0.0" />
4141
<PackageVersion Include="Microsoft.Data.Edm" Version="5.8.5" />
4242
<PackageVersion Include="Microsoft.Data.OData" Version="5.8.5" />
@@ -49,7 +49,7 @@
4949
<ItemGroup>
5050
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.0.0-beta.4" />
5151
<PackageVersion Include="CommandLineParser" Version="2.4.3" Condition="'$(TargetFramework)' == 'net6.0'" />
52-
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net462'" />
52+
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net48'" />
5353
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.EventSourceAnalyzer.NetCore" Version="2.0.1406.4" />
5454
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
5555
<PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.5.6" />
@@ -62,7 +62,7 @@
6262
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
6363
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
6464
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" Condition="'$(TargetFramework)' == 'net6.0'" />
65-
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net462'" />
65+
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net48'" />
6666
</ItemGroup>
6767

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

81-
<!-- Test dependencies with net462-->
82-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
81+
<!-- Test dependencies with net48-->
82+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
8383
<PackageVersion Include="EnterpriseLibrary.SemanticLogging" version="2.0.1406.1" />
8484
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.TextFile" version="2.0.1406.1" />
8585
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
@@ -114,8 +114,8 @@
114114
</ItemGroup>
115115

116116

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

‎src/DurableTask.AzureServiceFabric/DurableTask.AzureServiceFabric.csproj‎

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

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net462;net472</TargetFrameworks>
5+
<TargetFrameworks>net48;net472</TargetFrameworks>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<PackageId>Microsoft.Azure.DurableTask.AzureServiceFabric</PackageId>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -16,7 +16,7 @@
1616
<NoWarn>$(NoWarn);NU5104</NoWarn>
1717
</PropertyGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
2020
<Reference Include="System.Web" />
2121
</ItemGroup>
2222

‎src/DurableTask.Emulator/DurableTask.Emulator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
66
<PackageId>Microsoft.Azure.DurableTask.Emulator</PackageId>
77
<!--NuGet licenseUrl and PackageIconUrl/iconUrl deprecation. -->
88
<NoWarn>NU5125;NU5048</NoWarn>

‎src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj‎

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

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

27-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
2828
<PackageReference Include="ImpromptuInterface" />
2929
<PackageReference Include="Microsoft.Azure.KeyVault.Core" />
3030
<PackageReference Include="Microsoft.Data.Edm" />

‎test/DurableTask.AzureServiceFabric.Integration.Tests/DurableTask.AzureServiceFabric.Integration.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
44
<PropertyGroup>
5-
<TargetFramework>net462</TargetFramework>
5+
<TargetFramework>net48</TargetFramework>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<Platforms>AnyCPU;x64</Platforms>
88
</PropertyGroup>

‎test/DurableTask.AzureServiceFabric.Tests/DurableTask.AzureServiceFabric.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
44
<PropertyGroup>
5-
<TargetFramework>net462</TargetFramework>
5+
<TargetFramework>net48</TargetFramework>
66
<Platforms>AnyCPU;x64</Platforms>
77
</PropertyGroup>
88

‎test/DurableTask.AzureStorage.Tests/AzureStorageScenarioTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace DurableTask.AzureStorage.Tests
3636
using Moq;
3737
using Newtonsoft.Json;
3838
using Newtonsoft.Json.Linq;
39-
#if !NET462
39+
#if !net48
4040
using OpenTelemetry;
4141
using OpenTelemetry.Trace;
4242
#endif
@@ -1652,7 +1652,7 @@ public async Task LargeMessage_WithEscapedInstanceId_CanBeStoredAndFetchedSucces
16521652

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

16581658
Assert.AreEqual(OrchestrationStatus.Completed, status?.OrchestrationStatus);
@@ -2633,7 +2633,7 @@ public async Task OrchestrationRejectsWithVersionMismatch()
26332633
}
26342634
}
26352635

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

26892689
// Checking tag values
2690-
string activity2TypeValue = activity2.Tags.First(k => (k.Key).Equals("durabletask.type" )).Value;
2690+
string activity2TypeValue = activity2.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
26912691
string activity5TypeValue = activity5.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
26922692
string activity8TypeValue = activity8.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;
26932693
string activity9TypeValue = activity9.Tags.First(k => (k.Key).Equals("durabletask.type")).Value;

‎test/DurableTask.AzureStorage.Tests/DurableTask.AzureStorage.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

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

8-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
8+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
99
<PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" />
1010
</ItemGroup>
1111

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

46-
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
46+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
4747
<Reference Include="System.Configuration" />
4848
</ItemGroup>
4949

‎test/DurableTask.Core.Tests/DispatcherMiddlewareTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// See the License for the specific language governing permissions and
1111
// limitations under the License.
1212
// ----------------------------------------------------------------------------------
13-
#if !NET462 // for some reasons these tests are not discoverable on 1ES, leading to the test getting aborted. TODO: Needs investigation
13+
#if !net48 // for some reasons these tests are not discoverable on 1ES, leading to the test getting aborted. TODO: Needs investigation
1414
#nullable enable
1515
namespace DurableTask.Core.Tests
1616
{
@@ -263,7 +263,7 @@ public void EnsureOrchestrationExecutionContextSupportsDataContractSerialization
263263
[TestMethod]
264264
public async Task EnsureSubOrchestrationDispatcherMiddlewareHasAccessToRuntimeState()
265265
{
266-
ConcurrentBag<OrchestrationExecutionContext> capturedContexts = new ConcurrentBag<OrchestrationExecutionContext>();
266+
ConcurrentBag<OrchestrationExecutionContext> capturedContexts = new ConcurrentBag<OrchestrationExecutionContext>();
267267

268268
for (var i = 0; i < 10; i++)
269269
{

‎test/DurableTask.Core.Tests/DurableTask.Core.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

88
<ItemGroup>

0 commit comments

Comments
 (0)