Skip to content
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
22 changes: 17 additions & 5 deletions .github/workflows/build-and-test-SHIM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,29 @@ jobs:
runs-on: ${{ matrix.os }}

env:
SOLUTION: ./Everything.sln
TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
framework: [net462, net472, net480, net481, net8.0, net9.0, net10.0]
framework: [net8.0, net9.0, net10.0, net462, net472, net480, net481]
exclude:
# .NET Framework doesn't run on Linux
- os: ubuntu-latest
framework: net462
- os: ubuntu-latest
framework: net472
- os: ubuntu-latest
framework: net480
- os: ubuntu-latest
framework: net481
include:
- os: ubuntu-latest
args: "--filter TestCategory!=WindowsOnly"
solution: ./Everything.Linux.slnf
- os: windows-latest
solution: ./Everything.Windows.slnf

steps:
- uses: actions/checkout@v6
Expand All @@ -44,15 +56,15 @@ jobs:
10.0.x

- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
run: dotnet restore ${{ matrix.solution }}

- name: Build
run: dotnet build ${{ env.SOLUTION }} --configuration Release --no-restore
run: dotnet build ${{ matrix.solution }} --configuration Release --no-restore

- name: Test
id: test1
continue-on-error: true
run: dotnet test ${{ env.SOLUTION }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_" ${{ matrix.args }}
run: dotnet test ${{ matrix.solution }} --framework ${{ matrix.framework }} --configuration Release --no-build --results-directory ${{ env.TEST_RESULTS_DIRECTORY }} --logger:"console;verbosity=detailed" --logger:"trx;logfileprefix=testResults_" ${{ matrix.args }}

- name: Retry tests
if: steps.test1.outcome=='failure'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<PropertyGroup>
<RootNamespace>Microsoft.ApplicationInsights</RootNamespace>
<AssemblyName>Microsoft.ApplicationInsights</AssemblyName>
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net462</TargetFrameworks>
<TargetFrameworks Condition="$(OS) != 'Windows_NT'">net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

Expand All @@ -31,10 +31,9 @@
<PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Condition="$(OS) == 'Windows_NT' And '$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net9.0' And '$(TargetFramework)' != 'net10.0'">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<!--<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />-->
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' And '$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net9.0' And '$(TargetFramework)' != 'net10.0'">
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0' And '$(TargetFramework)' != 'net9.0' And '$(TargetFramework)' != 'net10.0'">
<Reference Include="System.Net.Http" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- [Removed `netstandard2.0` target framework from `Microsoft.ApplicationInsights`, `Microsoft.ApplicationInsights.AspNetCore`, and `Microsoft.ApplicationInsights.WorkerService` packages.](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3091)
- [The JavaScript in `Microsoft.ApplicationInsights.AspNetCore` has been updated to version 10.](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3078)
- [Centralized package version management](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3080)
- [Update OpenTelemetry dependencies](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3080), [#3092](https://github.com/microsoft/ApplicationInsights-dotnet/pull/3092)
Expand Down
17 changes: 17 additions & 0 deletions Everything.Linux.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"solution": {
"path": "Everything.sln",
"projects": [
"BASE\\src\\Microsoft.ApplicationInsights\\Microsoft.ApplicationInsights.csproj",
"examples\\BasicConsoleApp\\BasicConsoleApp.csproj",
"examples\\AspNetCoreWebApp\\AspNetCoreWebApp.csproj",
"examples\\WorkerService\\WorkerService.csproj",
"NETCORE\\src\\Microsoft.ApplicationInsights.AspNetCore\\Microsoft.ApplicationInsights.AspNetCore.csproj",
"NETCORE\\src\\Microsoft.ApplicationInsights.WorkerService\\Microsoft.ApplicationInsights.WorkerService.csproj",
"NETCORE\\test\\IntegrationTests.WebApp\\IntegrationTests.WebApp.csproj",
"NETCORE\\test\\IntegrationTests.WorkerApp\\IntegrationTests.WorkerApp.csproj",
"NETCORE\\test\\IntegrationTests.Tests\\IntegrationTests.Tests.csproj",
"NETCORE\\test\\WorkerIntegrationTests.Tests\\WorkerIntegrationTests.Tests.csproj"
]
}
}
23 changes: 23 additions & 0 deletions Everything.Windows.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"solution": {
"path": "Everything.sln",
"projects": [
"BASE\\src\\Microsoft.ApplicationInsights\\Microsoft.ApplicationInsights.csproj",
"BASE\\Test\\Microsoft.ApplicationInsights.Test\\Microsoft.ApplicationInsights.Tests\\Microsoft.ApplicationInsights.Tests.csproj",
"examples\\BasicConsoleApp\\BasicConsoleApp.csproj",
"examples\\NLogConsoleApp\\NLogConsoleApp.csproj",
"examples\\AspNetCoreWebApp\\AspNetCoreWebApp.csproj",
"examples\\WorkerService\\WorkerService.csproj",
"LOGGING\\src\\NLogTarget\\NLogTarget.csproj",
"LOGGING\\test\\NLogTarget.Tests\\NLogTarget.Tests.csproj",
"NETCORE\\src\\Microsoft.ApplicationInsights.AspNetCore\\Microsoft.ApplicationInsights.AspNetCore.csproj",
"NETCORE\\src\\Microsoft.ApplicationInsights.WorkerService\\Microsoft.ApplicationInsights.WorkerService.csproj",
"NETCORE\\test\\IntegrationTests.WebApp\\IntegrationTests.WebApp.csproj",
"NETCORE\\test\\IntegrationTests.WorkerApp\\IntegrationTests.WorkerApp.csproj",
"NETCORE\\test\\IntegrationTests.Tests\\IntegrationTests.Tests.csproj",
"NETCORE\\test\\WorkerIntegrationTests.Tests\\WorkerIntegrationTests.Tests.csproj",
"WEB\\Src\\Web\\Web\\Web.csproj",
"WEB\\Src\\Web\\Web.Tests\\Web.Tests.csproj"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

<PropertyGroup>
<AssemblyName>Microsoft.ApplicationInsights.AspNetCore</AssemblyName>
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0;</TargetFrameworks>

<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);AI_ASPNETCORE_WEB;</DefineConstants>
<AutomaticallyUpdatePublicAPI>true</AutomaticallyUpdatePublicAPI>
</PropertyGroup>
Expand All @@ -19,10 +17,6 @@
<PackageTags>$(PackageTags)aspnetcore;</PackageTags>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<NoWarn>1701;1702</NoWarn>
</PropertyGroup>

<Import Project="..\Shared\Shared.projitems" Label="Shared" />

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<AssemblyName>Microsoft.ApplicationInsights.WorkerService</AssemblyName>
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);AI_ASPNETCORE_WORKER;</DefineConstants>
</PropertyGroup>

Expand Down
Loading