Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ parameters:

variables:
# MSIXVersion's second part should always be odd to account for stub app's version
MSIXVersion: '0.1901'
MSIXVersion: '0.2001'
VersionOfSDK: '0.700'
solution: '**/DevHome.sln'
appxPackageDir: 'AppxPackages'
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/CreateBuildInfo.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Param(
)

$Major = "0"
$Minor = "19"
$Minor = "20"
$Patch = "99" # default to 99 for local builds

$versionSplit = $Version.Split(".");
Expand Down
27 changes: 0 additions & 27 deletions build/scripts/Unstub.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,3 @@ $itemGroupNode = $xml.CreateElement("ItemGroup")
$itemGroupNode.AppendChild($packageReferenceNode)
$xml.DocumentElement.AppendChild($itemGroupNode)
$xml.Save($projFile)


#
# Unstub native telemetry
#

# Delete the existing stub .h
Remove-Item "$($PSScriptRoot)\..\..\telemetry\DevHome.Telemetry.Native\inc\MicrosoftTelemetry.h"

# Load packages.config
$packagesConfig = "$($PSScriptRoot)\..\..\telemetry\DevHome.Telemetry.Native\packages.config"
$xml = [xml](Get-Content $packagesConfig -Encoding UTF8 -Raw)
$xml.PreserveWhitespace = $true

# Create new <package>
# e.g. <package id="Microsoft.Telemetry.Inbox.Native" version="10.0.18362.1-190318-1202.19h1-release.amd64fre" targetFramework="native" />
$packageNode = $xml.CreateElement("package");
$packageNode.SetAttribute("id", "Microsoft.Telemetry.Inbox.Native")
$packageNode.SetAttribute("version", "10.0.18362.1-190318-1202.19h1-release.amd64fre")
$packageNode.SetAttribute("targetFramework", "native")

# Append to <packages>
$packagesNode = $xml.SelectSingleNode("/packages")
$packagesNode.AppendChild($packageNode)

# Save
$xml.Save($packagesConfig)
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ private async Task InstallOrUpdateAppInstallerIfNeeded(IProgress<DevSetupEngineT
}
}

#pragma warning disable CA1859
public async Task<DevSetupEngineTypes.IApplyConfigurationResult> ApplyConfigurationAsync(string content, IProgress<DevSetupEngineTypes.IConfigurationSetChangeData> progress)
{
DevSetupEngineTypes.IOpenConfigurationSetResult? openConfigurationSetResult = default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public async Task ValidateConfigurationAsync(IDSCFile file)
/// </summary>
/// <param name="result">Result of applying the configuration set</param>
/// <param name="activityId">Activity ID</param>
#pragma warning disable CA1859
private void ReportApplyConfigurationResult(IDSCApplicationResult result, Guid activityId)
{
foreach (var unitResult in result.UnitResults)
Expand Down
3 changes: 3 additions & 0 deletions src/Strings/en-us/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -292,4 +292,7 @@
<data name="GPODisabledDevHomeDescription.Text" xml:space="preserve">
<value>Check with your IT or System Administrator for support.</value>
</data>
<data name="ShellInfoBar.Message" xml:space="preserve">
<value>Dev Home will be going away in May 2025 and a subset of its features will be moved to new places. Stay tuned for more information in the following months.</value>
</data>
</root>
2 changes: 2 additions & 0 deletions src/Views/ShellPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
</Grid>
</NavigationView>

<InfoBar x:Uid="ShellInfoBar" IsOpen="True" Severity="Error" Margin="20,40,20,10"></InfoBar>

<StackPanel
Grid.Row="1"
HorizontalAlignment="Center"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ private bool ShouldShowDashboardBanner()
}

#if DEBUG
#pragma warning disable CA1853
public void ResetDashboardBanner()
{
ShowDashboardBanner = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,7 @@ private void AddResetButton(object sender, RoutedEventArgs e)
parent.Children.Insert(index + 1, resetButton);
}

#pragma warning disable CA1853
private void ResetButton_Click(object sender, RoutedEventArgs e)
{
var roamingProperties = Windows.Storage.ApplicationData.Current.RoamingSettings.Values;
Expand Down
Loading