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.

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

Bump projects to .NET 8 and package references to latest available #189

Merged
merged 6 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/azure-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
- name: 'Checkout GitHub Action'
uses: actions/checkout@v2

- name: Setup .NET Core 6.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 8.0.100

- name: Setup .NET Core 7.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
include-prerelease: true

- name: 'Build Functions'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
- name: 'Checkout'
uses: actions/checkout@v2

- name: Setup .NET Core 6.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 8.0.100

- name: Setup .NET Core 7.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
include-prerelease: true

- name: Restore
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nuget-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup .NET Core 6.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 8.0.100

- name: Setup .NET Core 7.0
- name: Setup .NET Core 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
include-prerelease: true

- name: Restore dependencies
Expand Down
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/runfo/bin/Debug/netcoreapp3.1/runfo.dll",
"program": "${workspaceFolder}/runfo/bin/Debug/net8.0/runfo.dll",
"args": [
"timeline",
"-b",
Expand All @@ -26,7 +26,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/scratch/bin/Debug/net6.0/scratch.dll",
"program": "${workspaceFolder}/scratch/bin/Debug/net8.0/scratch.dll",
"args": [
],
"cwd": "${workspaceFolder}/scratch",
Expand All @@ -39,7 +39,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/triage/bin/Debug/netcoreapp3.1/triage.dll",
"program": "${workspaceFolder}/triage/bin/Debug/net8.0/triage.dll",
"args": [
"scratch"
],
Expand All @@ -52,7 +52,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/DevOps.Status/bin/Debug/netcoreapp3.1/DevOps.Status.dll",
"program": "${workspaceFolder}/DevOps.Status/bin/Debug/net8.0/DevOps.Status.dll",
"args": [],
"cwd": "${workspaceFolder}/DevOps.Status",
"stopAtEntry": false,
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Runfo",
"nuget"
],
"azureFunctions.deploySubpath": "DevOps.Functions/bin/Release/netcoreapp3.1/publish",
"azureFunctions.deploySubpath": "DevOps.Functions/bin/Release/net8.0/publish",
"azureFunctions.projectLanguage": "C#",
"azureFunctions.projectRuntime": "~3",
"debug.internalConsoleOptions": "neverOpen",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"type": "func",
"dependsOn": "build",
"options": {
"cwd": "${workspaceFolder}/DevOps.Functions/bin/Debug/netcoreapp3.1"
"cwd": "${workspaceFolder}/DevOps.Functions/bin/Debug/net8.0"
},
"command": "host start",
"isBackground": true,
Expand Down
2 changes: 1 addition & 1 deletion DevOps.Functions/DevOps.Functions.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion DevOps.Status/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"appService.preDeployTask": "publish-release",
"appService.deploySubpath": "bin/Release/netcoreapp3.1/publish"
"appService.deploySubpath": "bin/Release/net8.0/publish"
}
4 changes: 2 additions & 2 deletions DevOps.Status/DevOps.Status.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<UserSecretsId>67c4a872-5dd7-422a-acad-fdbe907ace33</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="6.0.14" />
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
<PackageReference Include="Azure.Identity" Version="1.8.2" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
<ProjectReference Include="..\DevOps.Util\DevOps.Util.csproj" />
<ProjectReference Include="..\DevOps.Util.DotNet\DevOps.Util.DotNet.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions DevOps.Util.DotNet/DevOps.Util.DotNet.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Queues" Version="12.4.2" />
<PackageReference Include="Azure.Storage.Queues" Version="12.18.0" />
<ProjectReference Include="..\DevOps.Util\DevOps.Util.csproj" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.16" />
<PackageReference Include="YamlDotNet" Version="8.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion DevOps.Util.UnitTests/DevOps.Util.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions DevOps.Util/DevOps.Util.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.DotNet.Helix.Client" Version="5.0.0-beta.20465.8" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100",
"rollForward": "minor"
}
}
4 changes: 2 additions & 2 deletions runfo/runfo.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RollForward>Major</RollForward>

<!-- NuGet Information -->
<PackAsTool>true</PackAsTool>
<ToolCommandName>runfo</ToolCommandName>
<PackageVersion>0.7.0</PackageVersion>
<PackageVersion>0.9.0</PackageVersion>
<PackageDescription>Tool for quickly analyzing Azure Pipelines Build failures.</PackageDescription>
<PackageLongDescription>

Expand Down
4 changes: 2 additions & 2 deletions scratch/scratch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<UserSecretsId>67c4a872-5dd7-422a-acad-fdbe907ace33</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.4.0" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.1.17" />
<ProjectReference Include="..\DevOps.Util.DotNet\DevOps.Util.DotNet.csproj" />
<ProjectReference Include="..\DevOps.Util\DevOps.Util.csproj" />
Expand Down
Loading