Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.NET 8 SDK Upgrade #56

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

.NET 8 SDK Upgrade #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1882b5e
Update global.json
pedropaulovc Mar 19, 2024
473d091
Update NuGet packages
pedropaulovc Mar 19, 2024
b262d4b
Update GitHub actions
pedropaulovc Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/dotnetcore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json

Expand All @@ -43,7 +43,7 @@ jobs:
run: dotnet pack $solution --configuration $config --no-build

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pkg
path: ./out/pkg
Expand All @@ -55,16 +55,16 @@ jobs:

steps:
- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: pkg
path: pkg

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x

- name: Push Nuget
env:
Expand Down
43 changes: 18 additions & 25 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<Project>

<!-- Azure -->
<ItemGroup>
<PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="2.13.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.Core" Version="2.16.1" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be upgraded? I prefer to leave dependencies of a library at a minimum for what the code base needs directly. End users can then decide to pin transitive dependencies at a higher version if they need.

This lets this library capture the widest customer base possible: if a project for some reason cannot update a transitive dependency, this will not force them to.

<PackageVersion Include="Microsoft.Azure.DurableTask.Emulator" Version="2.6.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.ServiceBus" Version="2.7.0" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.13.8" />
<PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.17.1" />
</ItemGroup>

<!-- Microsoft Extensions -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(ExtensionsPackageVersion)" />
Expand All @@ -26,40 +24,35 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(ExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(ExtensionsPackageVersion)" />
</ItemGroup>

<!-- Telemetry -->
<ItemGroup>
<PackageVersion Include="OpenTelemetry" Version="1.3.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.3.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.3.1" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.7.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
</ItemGroup>

<!-- Nuget -->
<ItemGroup>
</ItemGroup>

<!-- Test projects -->
<!-- Test projects -->
<ItemGroup>
<PackageVersion Include="Bogus" Version="27.0.1" />
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
<PackageVersion Include="coverlet.msbuild" Version="3.1.2" />
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.analyzers" Version="1.0.0" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.5.7-beta" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.analyzers" Version="1.11.0" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
</ItemGroup>

<!-- Global -->
<ItemGroup>
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" Condition="'$(EnableGitVersioning)' != 'false'" />
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" Condition="'$(EnableStyleCop)' != 'false'" />
<GlobalPackageReference Include="StyleCop.CSharp.Async.Rules" Version="6.1.41" Condition="'$(EnableStyleCop)' != 'false'" />
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" Condition="'$(IsPackable)' != 'false'" />
</ItemGroup>

</Project>
</Project>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: add newline at end of file.

2 changes: 1 addition & 1 deletion eng/Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableStyleCop>true</EnableStyleCop>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<ExtensionsPackageVersion Condition="'$(ExtensionsPackageVersion)' == ''">2.1.0</ExtensionsPackageVersion>
<ExtensionsPackageVersion Condition="'$(ExtensionsPackageVersion)' == ''">8.0.0</ExtensionsPackageVersion>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer not to force all users of this library onto 8.0.0 versions of Microsoft.Extensions.*. Upgrading major versions of a transitive dependency is a breaking change to users.

</PropertyGroup>

<PropertyGroup Condition="'$(IsTestProject)' != 'true'">
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.203",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.1.3",
"Microsoft.Build.NoTargets": "3.5.6",
"Microsoft.Build.Traversal": "3.2.0"
"Microsoft.Build.NoTargets": "3.7.56",
"Microsoft.Build.Traversal": "4.1.0"
}
}
2 changes: 1 addition & 1 deletion samples/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<ExtensionsPackageVersion>3.1.0</ExtensionsPackageVersion>
<ExtensionsPackageVersion>8.0.0</ExtensionsPackageVersion>
</PropertyGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, $(_DirectoryBuildPropsFile)))\$(_DirectoryBuildPropsFile)"
Expand Down