Skip to content

Commit 0d04a53

Browse files
[Shim] Update CI (#3008)
* Update CI * Remove classic ASP.NET example from sln
1 parent cfb871a commit 0d04a53

File tree

8 files changed

+8
-268
lines changed

8 files changed

+8
-268
lines changed

.github/workflows/build-and-test-LOGGING.yml

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

.github/workflows/build-and-test-NETCORE.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
33
# Description: The purpose of this workflow is to compile and run unit tests.
44

5-
name: Build And Test, BASE
5+
name: Build And Test, SHIM
66

77
on:
88
workflow_dispatch:
99
push:
10-
branches: [ main ]
10+
branches: [ "main", "develop", "master" ]
1111
pull_request:
12-
branches: [ main ]
12+
branches: [ "main", "develop", "master" ]
1313

1414
jobs:
15-
build-test-BASE:
15+
build-test-SHIM:
1616

1717
runs-on: ${{ matrix.os }}
1818

1919
env:
20-
SOLUTION: ./BASE/Microsoft.ApplicationInsights.sln
20+
SOLUTION: ./SHIM/Microsoft.ApplicationInsights.Shim.sln
2121
TEST_RESULTS_DIRECTORY: ${{ github.workspace }}/TestResults
2222

2323
strategy:
2424
fail-fast: false
2525
matrix:
2626
os: [ubuntu-latest, windows-latest]
27-
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0, net9.0]
27+
framework: [net462, net472, net480, net481, net8.0, net9.0]
2828
include:
2929
- os: ubuntu-latest
3030
args: "--filter TestCategory!=WindowsOnly"

.github/workflows/build-and-test-WEB.yml

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

.github/workflows/codeql-csharp.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
solution:
48-
- ./NETCORE/ApplicationInsights.AspNetCore.sln
49-
- ./Everything.sln
50-
- ./ProjectsForSigning.sln
51-
- ./examples/Examples.sln
52-
- ./LOGGING/Logging.sln
53-
- ./BASE/Microsoft.ApplicationInsights.sln
54-
- ./WEB/Src/Microsoft.ApplicationInsights.Web.sln
48+
- ./SHIM/Microsoft.ApplicationInsights.Shim.sln
5549
include:
5650
- language: csharp
5751
build-mode: manual
@@ -72,9 +66,6 @@ jobs:
7266
uses: actions/setup-dotnet@v4.3.1
7367
with:
7468
dotnet-version: |
75-
3.1.x
76-
6.0.x
77-
7.0.x
7869
8.0.x
7970
9.0.x
8071

.github/workflows/redfield-sanity-check.yml

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

.github/workflows/sanity.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
solution: [
23-
./NETCORE/ApplicationInsights.AspNetCore.sln,
24-
./Everything.sln,
25-
./ProjectsForSigning.sln,
26-
./examples/Examples.sln,
27-
./LOGGING/Logging.sln,
28-
./BASE/Microsoft.ApplicationInsights.sln,
29-
./WEB/Src/Microsoft.ApplicationInsights.Web.sln]
22+
solution: [./SHIM/Microsoft.ApplicationInsights.Shim.sln]
3023

3124
steps:
3225
- uses: actions/checkout@v4
@@ -35,9 +28,6 @@ jobs:
3528
uses: actions/setup-dotnet@v4.3.1
3629
with:
3730
dotnet-version: |
38-
3.1.x
39-
6.0.x
40-
7.0.x
4131
8.0.x
4232
9.0.x
4333

SHIM/Microsoft.ApplicationInsights.Shim.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerService", "..\example
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "..\WEB\Src\Web\Web\Web.csproj", "{6835434F-678C-EAA1-AFBF-3ABDA158022B}"
2727
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassicAspNetWebApp", "..\examples\ClassicAspNetWebApp\ClassicAspNetWebApp.csproj", "{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}"
29-
EndProject
3028
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.WebApp", "..\NETCORE\test\IntegrationTests.WebApp\IntegrationTests.WebApp.csproj", "{0935B859-7B8E-8DFF-B593-F8AADB676DD8}"
3129
EndProject
3230
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.Tests", "..\NETCORE\test\IntegrationTests.Tests\IntegrationTests.Tests.csproj", "{5001237F-504A-A179-82C7-DB6F861D57F7}"
@@ -149,18 +147,6 @@ Global
149147
{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x64.Build.0 = Release|Any CPU
150148
{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x86.ActiveCfg = Release|Any CPU
151149
{6835434F-678C-EAA1-AFBF-3ABDA158022B}.Release|x86.Build.0 = Release|Any CPU
152-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|Any CPU.Build.0 = Debug|Any CPU
154-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x64.ActiveCfg = Debug|Any CPU
155-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x64.Build.0 = Debug|Any CPU
156-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x86.ActiveCfg = Debug|Any CPU
157-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Debug|x86.Build.0 = Debug|Any CPU
158-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|Any CPU.ActiveCfg = Release|Any CPU
159-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|Any CPU.Build.0 = Release|Any CPU
160-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x64.ActiveCfg = Release|Any CPU
161-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x64.Build.0 = Release|Any CPU
162-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x86.ActiveCfg = Release|Any CPU
163-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619}.Release|x86.Build.0 = Release|Any CPU
164150
{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165151
{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
166152
{0935B859-7B8E-8DFF-B593-F8AADB676DD8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -194,7 +180,6 @@ Global
194180
{638BEEB8-40A0-47E0-9410-0B61FB9D6FA5} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
195181
{52878653-54FF-8F20-7D86-98CE35C8BBFB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
196182
{FE4868CE-CE53-464D-B676-ED54519A99B3} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
197-
{31EB3F86-42C6-4792-8ADA-E9D9AA5F7619} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
198183
EndGlobalSection
199184
GlobalSection(ExtensibilityGlobals) = postSolution
200185
SolutionGuid = {1C15D81D-35A4-4FD4-B98C-4A47ED4B98EB}

0 commit comments

Comments
 (0)