Skip to content

Commit 7d5da2a

Browse files
Update SB samples to target NET6.0 (Azure#32581)
* Update SB samples to target NET6.0 * Use central dependency versions * fix * Fix * Specify versions when not building in repo
1 parent a259485 commit 7d5da2a

File tree

5 files changed

+52
-23
lines changed

5 files changed

+52
-23
lines changed

eng/Packages.Data.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,10 @@
180180
<ItemGroup Condition="('$(IsTestProject)' == 'true') OR ('$(IsTestSupportProject)' == 'true') OR ('$(IsPerfProject)' == 'true') OR ('$(IsStressProject)' == 'true') OR ('$(IsSamplesProject)' == 'true')">
181181
<PackageReference Update="ApprovalTests" Version="3.0.22" />
182182
<PackageReference Update="ApprovalUtilities" Version="3.0.22" />
183+
<PackageReference Update="Azure.Identity" Version="1.7.0" />
183184
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.2.0" />
184185
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.0.0" />
186+
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.11.1" />
185187
<PackageReference Update="Azure.ResourceManager.Compute" Version="1.0.0" />
186188
<PackageReference Update="Azure.ResourceManager.Network" Version="1.0.1" />
187189
<PackageReference Update="Azure.ResourceManager.Resources" Version="1.3.1" />
Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
</PropertyGroup>
67

7-
<ItemGroup>
8-
<PackageReference Include="Azure.Identity" Version="1.2.1" />
9-
<!-- Using project reference out until processor subqueue fix is released-->
10-
<!-- <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.2.0-beta.2" />-->
11-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
12-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Azure.Identity" />
10+
<PackageReference Include="Azure.Messaging.ServiceBus" />
11+
<PackageReference Include="System.CommandLine" VersionOverride="2.0.0-beta1.21216.1" />
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<ProjectReference Include="..\..\src\Azure.Messaging.ServiceBus.csproj" />
16-
</ItemGroup>
14+
<!-- Use decentralized package references when building outside https://github.com/Azure/azure-sdk-for-net -->
15+
<ItemGroup Condition="'$(IsSamplesProject)' != 'true'">
16+
<PackageReference Update="Azure.Identity" Version="1.7.0" />
17+
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.11.1" />
18+
<PackageReference Update="System.CommandLine" Version="%(VersionOverride)" />
19+
</ItemGroup>
1720

1821
</Project>
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<!-- Signal that samples are building in the repo as opposed to a standalone download from Samples Browser -->
4-
<IsSample>true</IsSample>
4+
<IsSamplesProject>true</IsSamplesProject>
55
<IsPackable>false</IsPackable>
66
<ExcludeFromCodeCoverage>true</ExcludeFromCodeCoverage>
7+
<ImportRepoCommonSettings>true</ImportRepoCommonSettings>
78
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
89
</PropertyGroup>
910

1011
<Import Project="..\Directory.Build.props" />
1112

1213
<PropertyGroup>
1314
<InheritDocEnabled>false</InheritDocEnabled>
15+
<IsShippingLibrary>false</IsShippingLibrary>
1416
</PropertyGroup>
1517
</Project>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<TargetFrameworks Condition="'$(TargetFramework)' != ''">$(TargetFramework)</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets"
8+
Condition="'$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))' != ''" />
9+
10+
<!-- Disable targets not necessary for samples -->
11+
<Target Name="ValidateTargetFrameworks" />
12+
<Target Name="VerifyProjectReferencesReferences" />
13+
14+
</Project>
Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net6.0</TargetFramework>
6+
</PropertyGroup>
67

7-
<ItemGroup>
8-
<PackageReference Include="Azure.Identity" Version="1.2.1" />
9-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.2.0-beta.2" />
10-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
11-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Azure.Identity" />
10+
<PackageReference Include="Azure.Messaging.ServiceBus" />
11+
<PackageReference Include="System.CommandLine" VersionOverride="2.0.0-beta1.21216.1" />
12+
</ItemGroup>
1213

14+
<!-- Use decentralized package references when building outside https://github.com/Azure/azure-sdk-for-net -->
15+
<ItemGroup Condition="'$(IsSamplesProject)' != 'true'">
16+
<PackageReference Update="Azure.Identity" Version="1.7.0" />
17+
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.11.1" />
18+
<PackageReference Update="System.CommandLine" Version="%(VersionOverride)" />
19+
</ItemGroup>
20+
1321
</Project>

0 commit comments

Comments
 (0)