Skip to content

Commit 727223d

Browse files
authored
Move FunctionsPreservedDependencies to props file to embed in package (#685)
1 parent f26f95f commit 727223d

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

src/IntegrationTests.HostV4/IntegrationTests.HostV4.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -25,16 +25,12 @@
2525
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2626
</ItemGroup>
2727

28-
<ItemGroup>
29-
<!-- Prevent Functions from removing NServiceBus dependencies that it thinks are included "in the box" -->
30-
<FunctionsPreservedDependencies Include="System.Diagnostics.DiagnosticSource.dll" />
31-
<FunctionsPreservedDependencies Include="System.Text.Json.dll" />
32-
<FunctionsPreservedDependencies Include="System.Text.Encodings.Web.dll" />
33-
</ItemGroup>
34-
3528
<ItemGroup>
3629
<None Update="host.json" CopyToOutputDirectory="PreserveNewest" />
3730
<None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
3831
</ItemGroup>
3932

33+
<!-- Import the props file from the component because it's referenced as a ProjectReference here, not a PackageReference -->
34+
<Import Project="..\NServiceBus.AzureFunctions.InProcess.ServiceBus\build\NServiceBus.AzureFunctions.InProcess.ServiceBus.props" />
35+
4036
</Project>

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/NServiceBus.AzureFunctions.InProcess.ServiceBus.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
1515
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.11.0" />
1616
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="[3.0.0, 4.0.0)" />
17-
<PackageReference Include="NServiceBus" Version="[8.0.0, 9.0.0)" />
17+
<PackageReference Include="NServiceBus" Version="[8.1.1, 9.0.0)" />
1818
<PackageReference Include="NServiceBus.Transport.AzureServiceBus" Version="[3.0.0, 4.0.0)" />
1919
<PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All" />
2020
<PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />

src/NServiceBus.AzureFunctions.InProcess.ServiceBus/build/NServiceBus.AzureFunctions.InProcess.ServiceBus.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,10 @@
22
<PropertyGroup>
33
<WarningsAsErrors>CS8032</WarningsAsErrors>
44
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- Prevent Functions from removing NServiceBus dependencies that it thinks are included "in the box" -->
7+
<FunctionsPreservedDependencies Include="System.Diagnostics.DiagnosticSource.dll" />
8+
<FunctionsPreservedDependencies Include="System.Text.Json.dll" />
9+
<FunctionsPreservedDependencies Include="System.Text.Encodings.Web.dll" />
10+
</ItemGroup>
511
</Project>

0 commit comments

Comments
 (0)