Skip to content

Improve shortcut creation in visualstudio.vm and microsoft-office.vm #1373

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 2 commits into from
Apr 24, 2025
Merged

Improve shortcut creation in visualstudio.vm and microsoft-office.vm #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d6132
[visualstudio.vm] Improve shortcut creation
Ana06 Apr 22, 2025
c11c0be
[microsoft-office.vm] Improve shortcut creation
Ana06 Apr 23, 2025
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 packages/microsoft-office.vm/microsoft-office.vm.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>microsoft-office.vm</id>
<version>0.0.0.20250218</version>
<version>0.0.0.20250423</version>
<description>Microsoft Office ProPlus2024Retail.</description>
<authors>Microsoft</authors>
<dependencies>
Expand Down
5 changes: 1 addition & 4 deletions packages/microsoft-office.vm/tools/chocolateyinstall.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ try {
@{name = 'OneNote'; executable = 'ONENOTE.EXE'}
)
$category = VM-Get-Category($MyInvocation.MyCommand.Definition)
$shortcutDir = Join-Path ${Env:TOOL_LIST_DIR} $category

# Install with choco instead as dependency to provide params such the product
choco install microsoft-office-deployment --params="'/DisableUpdate:TRUE /Product:ProPlus2024Retail'" --no-progress
Expand All @@ -20,9 +19,7 @@ try {
# Ensure the tools are installed and create shortcuts
forEach ($tool in $tools) {
$executablePath = Join-Path $officeDirectory $($tool.executable) -Resolve
$shortcut = Join-Path $shortcutDir "$($tool.name).lnk"
Install-ChocolateyShortcut -shortcutFilePath $shortcut -targetPath $executablePath
VM-Assert-Path $shortcut
VM-Install-Shortcut -toolName $tool.name -category $category -executablePath $executablePath
}
} catch {
VM-Write-Log-Exception $_
Expand Down
5 changes: 1 addition & 4 deletions packages/visualstudio.vm/tools/chocolateyinstall.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ try {
choco install visualstudio2022community --params "--add Microsoft.VisualStudio.Component.CoreEditor --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.ManagedDesktop --includeRecommended" --execution-timeout 6000 --no-progress

$executablePath = Join-Path ${Env:ProgramFiles} "Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe" -Resolve
$shortcutDir = Join-Path ${Env:TOOL_LIST_DIR} $category
$shortcut = Join-Path $shortcutDir "$toolName.lnk"
Install-ChocolateyShortcut -shortcutFilePath $shortcut -targetPath $executablePath
VM-Assert-Path $shortcut
VM-Install-Shortcut -toolName $toolName -category $category -executablePath $executablePath

# Refresh Desktop as shortcut is used in FLARE-VM LayoutModification.xml
VM-Refresh-Desktop
Expand Down
4 changes: 2 additions & 2 deletions packages/visualstudio.vm/visualstudio.vm.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>visualstudio.vm</id>
<version>17.6.1.20250219</version>
<description>IDE.</description>
<version>17.6.1.20250423</version>
<description>Visual Studio is an IDE, installed with useful components and workloads.</description>
<authors>Microsoft</authors>
<dependencies>
<dependency id="common.vm" version="0.0.0.20250206" />
Expand Down
Loading