Skip to content

Move ServiceMonitor download URL into versions file #1222

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Move ServiceMonitor download URL into versions file #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN dism /Online /Quiet /Enable-Feature /All /FeatureName:IIS-WebServerRole {{if
&& dism /Online /Quiet /Disable-Feature /FeatureName:IIS-WebServerManagementTools `
&& del /q "C:\inetpub\wwwroot\*" `
&& for /D %p IN ("C:\inetpub\wwwroot\*") DO rmdir "%p" /s /q `
&& curl -fSLo ServiceMonitor.exe https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe `
&& curl -fSLo ServiceMonitor.exe {{VARIABLES["servicemonitor|url"]}} `
{{if PRODUCT_VERSION = "3.5"
: && %windir%\System32\inetsrv\appcmd set apppool /apppool.name:DefaultAppPool /managedRuntimeVersion:v2.0 `
}} && %windir%\Microsoft.NET\Framework64\v4.0.30319\ngen update `
Expand Down
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile.3.5.pre20H2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN powershell -Command `
Remove-Item -Recurse C:\inetpub\wwwroot\*; `
{{if OS_VERSION_NUMBER = "ltsc2016"
: [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
}} Invoke-WebRequest -Uri https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe -OutFile C:\ServiceMonitor.exe `
}} Invoke-WebRequest -Uri {{VARIABLES["servicemonitor|url"]}} -OutFile C:\ServiceMonitor.exe `
&& %windir%\System32\inetsrv\appcmd set apppool /apppool.name:DefaultAppPool /managedRuntimeVersion:v2.0 `
{{if OS_VERSION_NUMBER = "ltsc2016" || OS_VERSION_NUMBER = "ltsc2019"
: && %windir%\Microsoft.NET\Framework64\v2.0.50727\ngen update `
Expand Down
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile.pre20H2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN Add-WindowsFeature Web-Server; `
Remove-Item -Recurse C:\inetpub\wwwroot\*; `
{{if OS_VERSION_NUMBER = "ltsc2016"
: [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
}} Invoke-WebRequest -Uri https://dotnetbinaries.blob.core.windows.net/servicemonitor/2.0.1.10/ServiceMonitor.exe -OutFile C:\ServiceMonitor.exe; `
}} Invoke-WebRequest -Uri {{VARIABLES["servicemonitor|url"]}} -OutFile C:\ServiceMonitor.exe; `
&$Env:windir\Microsoft.NET\Framework64\v4.0.30319\ngen update; `
&$Env:windir\Microsoft.NET\Framework\v4.0.30319\ngen update

Expand Down
3 changes: 3 additions & 0 deletions manifest.versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@

"nuget|version": "6.12.2",

"servicemonitor|version": "2.0.1.10",
"servicemonitor|url": "https://dotnetbinaries.blob.core.windows.net/servicemonitor/$(servicemonitor|version)/ServiceMonitor.exe",

"vs|version": "17.13",
"vs|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe",
"vs|buildToolsUrl": "https://aka.ms/vs/17/release/vs_BuildTools.exe",
Expand Down
Loading