Skip to content

First round of UI #5229

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

First round of UI #5229

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
5e48824
First round of UI
merriemcgaw Aug 17, 2025
eac7cb5
Working UI
merriemcgaw Aug 17, 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
5 changes: 4 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project>

<PropertyGroup>
<ArcadeSdkPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\arcade\artifacts\bin\Microsoft.DotNet.Arcade.Sdk\Release\net10.0\publish\'))</ArcadeSdkPath>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<PropertyGroup>
Expand Down Expand Up @@ -28,5 +32,4 @@
<!-- Builds are portable by default -->
<PortableBuild Condition="'$(PortableBuild)' != 'false'">true</PortableBuild>
</PropertyGroup>

</Project>
13 changes: 2 additions & 11 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>

<ItemGroup>
<!-- Arcade dependencies -->
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />

<!-- CoreFx dependencies -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.Data.DataSetExtensions" Version="$(SystemDataDataSetExtensionsVersion)" />
<PackageVersion Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
<PackageVersion Include="System.Reflection.Emit.ILGeneration" Version="$(SystemReflectionEmitILGenerationVersion)" />
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightVersion)" />
<PackageVersion Include="System.Reflection.Emit" Version="$(SystemReflectionEmitVersion)" />

<!-- NuGet dependencies -->
<PackageVersion Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />

<!-- Runtime dependencies -->
<PackageVersion Include="Microsoft.Win32.Registry.AccessControl" Version="$(MicrosoftWin32RegistryAccessControlVersion)" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
Expand Down Expand Up @@ -57,21 +53,17 @@
<PackageVersion Include="System.Speech" Version="$(SystemSpeechVersion)" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
<PackageVersion Include="System.Threading.AccessControl" Version="$(SystemThreadingAccessControlVersion)" />

<!-- WCF dependencies -->
<PackageVersion Include="System.ServiceModel.Http" Version="$(SystemServiceModelVersion)" />
<PackageVersion Include="System.ServiceModel.NetTcp" Version="$(SystemServiceModelVersion)" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="$(SystemServiceModelVersion)" />
<PackageVersion Include="System.Web.Services.Description" Version="$(SystemServiceModelVersion)" />

<!-- WinForms dependencies -->
<PackageVersion Include="Microsoft.Private.Winforms" Version="$(MicrosoftPrivateWinformsVersion)" />
<PackageVersion Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />

<!-- WPF dependencies-->
<PackageVersion Include="Microsoft.DotNet.Wpf.GitHub" Version="$(MicrosoftDotNetWpfGitHubVersion)" />
<PackageVersion Include="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="$(MicrosoftInternalRuntimeWindowsDesktopTransportVersion)" />

<!-- WiX v5 dependencies -->
<PackageVersion Include="Microsoft.Wix" Version="$(MicrosoftWixVersion)" />
<PackageVersion Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetUIWixextVersion)" />
Expand All @@ -80,5 +72,4 @@
<PackageVersion Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetBalWixextVersion)" />
<PackageVersion Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetHeatVersion)" />
</ItemGroup>

</Project>
</Project>
3 changes: 1 addition & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
</fallbackPackageFolders>
<packageSources>
<clear />
<!-- Local Arcade WiX v5 build - Build arcade locally and place packages here -->
<add key="local-arcade-wix-v5" value="C:\local-packages\arcade-wix-v5" />
<add key="local-arcade" value="c:\Users\mmcgaw\Repos\arcade\artifacts\packages\Release\NonShipping" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
Expand Down
31 changes: 31 additions & 0 deletions src/windowsdesktop/src/bundle/Bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">

<Bundle Name="$(loc.Title)"
Version="$(var.BundleVersion)"
Manufacturer="$(loc.Manufacturer)"
UpgradeCode="$(var.BundleUpgradeCode)">

<BootstrapperApplication>
<bal:WixStandardBootstrapperApplication LicenseFile="..\..\dummyeula.rtf"
LocalizationFile="LCID\1033\bundle.wxl"
ShowVersion="yes"
SuppressDowngradeFailure="yes"
SuppressOptionsUI="yes"
Theme="rtfLicense"
ThemeFile="bundle.thm" />

<?foreach LCID in 1028;1029;1031;1036;1040;1041;1042;1045;1049;1055;2052;3082?>
<Payload Id="thm_$(LCID)" Compressed="yes" Name="$(LCID)\thm.wxl" SourceFile="LCID\$(LCID)\bundle.wxl" />
<?endforeach?>

<Payload Name="DotNetLogo_124x.png" Compressed="yes" SourceFile="DotNetLogo_124x.png" />
<Payload Name="dotnet.ico" Compressed="yes" SourceFile="..\..\dotnet.ico" />
</BootstrapperApplication>

<Chain>
<!-- The Arcade build process will automatically populate the MSI packages here. -->
</Chain>
</Bundle>
</Wix>
Loading