Skip to content

Commit 122308d

Browse files
karpikplxiaomi7732
karpikpl
and
xiaomi7732
authored
Updates to dependencies - upgrade to .NET 8 (#380)
* Updates to dependencies - upgrade to .NET 8 * CI to .NET 8 * image for troubleshooting * update C# version and assembly version * Update image.yml --------- Co-authored-by: Saar Shen <[email protected]>
1 parent 8d67bf6 commit 122308d

File tree

13 files changed

+476
-117
lines changed

13 files changed

+476
-117
lines changed

‎.dockerignore‎

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
## Ignore Visual Studio temporary files, build results, and
2+
## files generated by popular Visual Studio add-ons.
3+
4+
# User-specific files
5+
*.suo
6+
*.user
7+
*.userosscache
8+
*.sln.docstates
9+
10+
# User-specific files (MonoDevelop/Xamarin Studio)
11+
*.userprefs
12+
13+
# Build results
14+
[Dd]ebug/
15+
[Dd]ebugPublic/
16+
[Rr]elease/
17+
[Rr]eleases/
18+
x64/
19+
x86/
20+
bld/
21+
[Bb]in/
22+
[Oo]bj/
23+
[Ll]og/
24+
25+
# Visual Studio 2015 cache/options directory
26+
.vs/
27+
# Uncomment if you have tasks that create the project's static files in wwwroot
28+
#wwwroot/
29+
30+
# MSTest test Results
31+
[Tt]est[Rr]esult*/
32+
[Bb]uild[Ll]og.*
33+
34+
# NUNIT
35+
*.VisualState.xml
36+
TestResult.xml
37+
38+
# Build Results of an ATL Project
39+
[Dd]ebugPS/
40+
[Rr]eleasePS/
41+
dlldata.c
42+
43+
# DNX
44+
project.lock.json
45+
artifacts/
46+
47+
*_i.c
48+
*_p.c
49+
*_i.h
50+
*.ilk
51+
*.meta
52+
*.obj
53+
*.pch
54+
*.pdb
55+
*.pgc
56+
*.pgd
57+
*.rsp
58+
*.sbr
59+
*.tlb
60+
*.tli
61+
*.tlh
62+
*.tmp
63+
*.tmp_proj
64+
*.log
65+
*.vspscc
66+
*.vssscc
67+
.builds
68+
*.pidb
69+
*.svclog
70+
*.scc
71+
72+
# Chutzpah Test files
73+
_Chutzpah*
74+
75+
# Visual C++ cache files
76+
ipch/
77+
*.aps
78+
*.ncb
79+
*.opendb
80+
*.opensdf
81+
*.sdf
82+
*.cachefile
83+
*.VC.db
84+
*.VC.VC.opendb
85+
86+
# Visual Studio profiler
87+
*.psess
88+
*.vsp
89+
*.vspx
90+
*.sap
91+
92+
# TFS 2012 Local Workspace
93+
$tf/
94+
95+
# Guidance Automation Toolkit
96+
*.gpState
97+
98+
# ReSharper is a .NET coding add-in
99+
_ReSharper*/
100+
*.[Rr]e[Ss]harper
101+
*.DotSettings.user
102+
103+
# JustCode is a .NET coding add-in
104+
.JustCode
105+
106+
# TeamCity is a build add-in
107+
_TeamCity*
108+
109+
# DotCover is a Code Coverage Tool
110+
*.dotCover
111+
112+
# NCrunch
113+
_NCrunch_*
114+
.*crunch*.local.xml
115+
nCrunchTemp_*
116+
117+
# MightyMoose
118+
*.mm.*
119+
AutoTest.Net/
120+
121+
# Web workbench (sass)
122+
.sass-cache/
123+
124+
# Installshield output folder
125+
[Ee]xpress/
126+
127+
# DocProject is a documentation generator add-in
128+
DocProject/buildhelp/
129+
DocProject/Help/*.HxT
130+
DocProject/Help/*.HxC
131+
DocProject/Help/*.hhc
132+
DocProject/Help/*.hhk
133+
DocProject/Help/*.hhp
134+
DocProject/Help/Html2
135+
DocProject/Help/html
136+
137+
# Click-Once directory
138+
publish/
139+
140+
# Publish Web Output
141+
*.[Pp]ublish.xml
142+
*.azurePubxml
143+
# TODO: Comment the next line if you want to checkin your web deploy settings
144+
# but database connection strings (with potential passwords) will be unencrypted
145+
*.pubxml
146+
*.publishproj
147+
148+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
149+
# checkin your Azure Web App publish settings, but sensitive information contained
150+
# in these scripts will be unencrypted
151+
PublishScripts/
152+
153+
# NuGet Packages
154+
*.nupkg
155+
# The packages folder can be ignored because of Package Restore
156+
**/packages/*
157+
# except build/, which is used as an MSBuild target.
158+
!**/packages/build/
159+
# Uncomment if necessary however generally it will be regenerated when needed
160+
#!**/packages/repositories.config
161+
# NuGet v3's project.json files produces more ignoreable files
162+
*.nuget.props
163+
*.nuget.targets
164+
165+
# Microsoft Azure Build Output
166+
csx/
167+
*.build.csdef
168+
169+
# Microsoft Azure Emulator
170+
ecf/
171+
rcf/
172+
173+
# Windows Store app package directories and files
174+
AppPackages/
175+
BundleArtifacts/
176+
Package.StoreAssociation.xml
177+
_pkginfo.txt
178+
179+
# Visual Studio cache files
180+
# files ending in .cache can be ignored
181+
*.[Cc]ache
182+
# but keep track of directories ending in .cache
183+
!*.[Cc]ache/
184+
185+
# Others
186+
ClientBin/
187+
~$*
188+
*~
189+
*.dbmdl
190+
*.dbproj.schemaview
191+
*.pfx
192+
*.publishsettings
193+
node_modules/
194+
orleans.codegen.cs
195+
196+
# Since there are multiple workflows, uncomment next line to ignore bower_components
197+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
198+
#bower_components/
199+
200+
# RIA/Silverlight projects
201+
Generated_Code/
202+
203+
# Backup & report files from converting an old project file
204+
# to a newer Visual Studio version. Backup files are not needed,
205+
# because we have git ;-)
206+
_UpgradeReport_Files/
207+
Backup*/
208+
UpgradeLog*.XML
209+
UpgradeLog*.htm
210+
211+
# SQL Server files
212+
*.mdf
213+
*.ldf
214+
215+
# Business Intelligence projects
216+
*.rdl.data
217+
*.bim.layout
218+
*.bim_*.settings
219+
220+
# Microsoft Fakes
221+
FakesAssemblies/
222+
223+
# GhostDoc plugin setting file
224+
*.GhostDoc.xml
225+
226+
# Node.js Tools for Visual Studio
227+
.ntvs_analysis.dat
228+
229+
# Visual Studio 6 build log
230+
*.plg
231+
232+
# Visual Studio 6 workspace options file
233+
*.opt
234+
235+
# Visual Studio LightSwitch build output
236+
**/*.HTMLClient/GeneratedArtifacts
237+
**/*.DesktopClient/GeneratedArtifacts
238+
**/*.DesktopClient/ModelManifest.xml
239+
**/*.Server/GeneratedArtifacts
240+
**/*.Server/ModelManifest.xml
241+
_Pvt_Extensions
242+
243+
# Paket dependency manager
244+
.paket/paket.exe
245+
paket-files/
246+
247+
# FAKE - F# Make
248+
.fake/
249+
250+
# JetBrains Rider
251+
.idea/
252+
*.sln.iml
253+
254+
# Local global.json
255+
global.json
256+
257+
# Anything that is local
258+
local.*
259+
260+
# BenchmarkDotNet Results
261+
BenchmarkDotNet.Artifacts/

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup .NET
2727
uses: actions/setup-dotnet@v2
2828
with:
29-
dotnet-version: 6.x
29+
dotnet-version: 8.x
3030

3131
- name: Restore dependencies
3232
run: dotnet restore ApplicationInsights.Kubernetes.sln

‎.github/workflows/image.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
name: Push Docker Image
3+
run-name: PushI Docker Image by @${{ github.actor }}
4+
5+
on:
6+
workflow_dispatch:
7+
8+
release:
9+
types:
10+
- published
11+
12+
permissions:
13+
packages: write
14+
15+
# ------------------------------------------------------------------------------------------------------------------------
16+
env:
17+
ACR_NAME: 'ghcr.io'
18+
ACR_APP_NAME: 'aik8s_troubleshoot'
19+
20+
# ------------------------------------------------------------------------------------------------------------------------
21+
jobs:
22+
build-and-push-image:
23+
runs-on: ubuntu-latest
24+
permissions:
25+
packages: write
26+
27+
steps:
28+
- name: Checkout code
29+
uses: actions/[email protected]
30+
31+
- name: Get repo name
32+
id: set-repo
33+
run: echo "REPO_NAME=$(basename ${{ github.repository }})" >> $GITHUB_OUTPUT
34+
35+
# Uses the `docker/login-action` action to log in to the Container registry using the account and password that
36+
# will publish the packages. Once published, the packages are scoped to the account defined here.
37+
- name: Log in to the Container registry
38+
uses: docker/login-action@327cd5a69de6c009b9ce71bce8395f28e651bf99
39+
with:
40+
registry: ${{ env.ACR_NAME }}
41+
username: ${{ github.actor }}
42+
password: ${{ secrets.GITHUB_TOKEN }}
43+
44+
- name: Set image name
45+
id: image-name
46+
run: |
47+
echo "IMAGE_NAME_NO_TAG=${{ github.repository_owner }}/${{ steps.set-repo.outputs.REPO_NAME }}/${{ env.ACR_APP_NAME }}" >> $GITHUB_OUTPUT
48+
49+
- name: Extract metadata (tags, labels) for Docker
50+
id: meta
51+
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
52+
with:
53+
images: ${{ env.ACR_NAME }}/${{ steps.image-name.outputs.IMAGE_NAME_NO_TAG }}
54+
labels: |
55+
org.opencontainers.image.title=aik8s_troubleshoot
56+
org.opencontainers.image.description=Troubleshooting image for Microsoft Application Insights for Kubernetes
57+
org.opencontainers.image.source=https://github.com/${{ github.repository_owner }}/${{ steps.set-repo.outputs.REPO_NAME }}
58+
tags: |
59+
type=raw,value=latest,enable={{is_default_branch}}
60+
type=ref,event=branch
61+
type=ref,event=pr
62+
type=semver,pattern={{version}}
63+
type=semver,pattern={{major}}.{{minor}}
64+
65+
- name: Build Docker image
66+
run: docker build -t ${{ env.ACR_APP_NAME }} .
67+
68+
- name: Build and push Docker image
69+
uses: docker/build-push-action@v6
70+
with:
71+
push: true
72+
labels: ${{ steps.meta.outputs.labels }}
73+
tags: ${{ steps.meta.outputs.tags }}

‎Dockerfile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build-env
2+
WORKDIR /app
3+
4+
# Copy csproj and restore as distinct layers
5+
COPY troubleshooting/AIK8sTroubleShooting/*.csproj /app/troubleshooting/AIK8sTroubleShooting/
6+
COPY src/ApplicationInsights.Kubernetes/*.csproj /app/src/ApplicationInsights.Kubernetes/
7+
8+
WORKDIR /app/troubleshooting/AIK8sTroubleShooting
9+
RUN dotnet restore
10+
11+
# Copy everything else and build
12+
COPY troubleshooting/AIK8sTroubleShooting /app/troubleshooting/AIK8sTroubleShooting
13+
COPY src /app/src
14+
COPY LICENSE /app/LICENSE
15+
COPY README.md /app/README.md
16+
RUN dotnet publish -c Release -o out
17+
18+
# Build runtime image
19+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine
20+
WORKDIR /app
21+
COPY --from=build-env /app/troubleshooting/AIK8sTroubleShooting/out .
22+
ENTRYPOINT ["dotnet", "AIK8sTroubleShooting.dll"]

‎src/ApplicationInsights.Kubernetes.HostingStartup/ApplicationInsights.Kubernetes.HostingStartup.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AssemblyName>Microsoft.ApplicationInsights.Kubernetes.HostingStartup</AssemblyName>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66

‎src/ApplicationInsights.Kubernetes/ApplicationInsights.Kubernetes.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Features>IOperation</Features>
44
</PropertyGroup>
55
<PropertyGroup>
6-
<TargetFramework>net6.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<RootNamespace>Microsoft.ApplicationInsights.Kubernetes</RootNamespace>
88
<AssemblyName>Microsoft.ApplicationInsights.Kubernetes</AssemblyName>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)