Skip to content

Commit 37f9796

Browse files
authored
Remove extra global.json, AppInsights test to net8.0 (#3219)
* Remove extra global.json, AppInsights test to net8.0 * Fix install-dotnet.yml update
1 parent e99be73 commit 37f9796

File tree

4 files changed

+11
-44
lines changed

4 files changed

+11
-44
lines changed

build/install-dotnet.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
steps:
22

3-
- task: UseDotNet@2 # Needed by our projects and CI steps
4-
displayName: Install .NET 6
3+
# Our tests target net8.0
4+
- task: UseDotNet@2
5+
displayName: 'Install .NET8 SDK'
56
inputs:
6-
packageType: sdk
7-
version: 6.x
7+
packageType: 'sdk'
8+
version: "8.x"
89

9-
- task: UseDotNet@2 # Needed by our projects and CI steps
10-
displayName: Install .NET 7
10+
# The SDK we use to build
11+
- task: UseDotNet@2
12+
displayName: 'Install current .NET SDK'
1113
inputs:
12-
packageType: sdk
13-
version: 7.x
14-
15-
- task: UseDotNet@2 # The pinned SDK we use to build
16-
displayName: Install .NET SDK from global.json
17-
inputs:
18-
packageType: sdk
14+
packageType: 'sdk'
1915
useGlobalJson: true

host/src/FunctionsNetHost/global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/Worker.ApplicationInsights.Tests/Worker.ApplicationInsights.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>Microsoft.Azure.Functions.Worker.ApplicationInsights.Tests</AssemblyName>
77
<RootNamespace>Microsoft.Azure.Functions.Worker.ApplicationInsights.Tests</RootNamespace>
@@ -20,10 +20,7 @@
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
2121
<PackageReference Include="Moq" Version="4.16.1" />
2222
<PackageReference Include="xunit" Version="2.4.1" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
24-
<PrivateAssets>all</PrivateAssets>
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
</PackageReference>
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
2724
</ItemGroup>
2825

2926
</Project>

0 commit comments

Comments
 (0)