Skip to content

Commit 74d3024

Browse files
Merge pull request #4037 from microsoft/staging
Release - 1/28/25
2 parents 752ecb2 + 1e8e287 commit 74d3024

File tree

8 files changed

+11
-2
lines changed

8 files changed

+11
-2
lines changed

build/azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ parameters:
3131

3232
variables:
3333
# MSIXVersion's second part should always be odd to account for stub app's version
34-
MSIXVersion: '0.1901'
34+
MSIXVersion: '0.2001'
3535
VersionOfSDK: '0.700'
3636
solution: '**/DevHome.sln'
3737
appxPackageDir: 'AppxPackages'

build/scripts/CreateBuildInfo.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Param(
66
)
77

88
$Major = "0"
9-
$Minor = "19"
9+
$Minor = "20"
1010
$Patch = "99" # default to 99 for local builds
1111

1212
$versionSplit = $Version.Split(".");

extensions/HyperVExtension/src/DevSetupEngine/ConfigurationFileHelper.cs

+1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ private async Task InstallOrUpdateAppInstallerIfNeeded(IProgress<DevSetupEngineT
293293
}
294294
}
295295

296+
#pragma warning disable CA1859
296297
public async Task<DevSetupEngineTypes.IApplyConfigurationResult> ApplyConfigurationAsync(string content, IProgress<DevSetupEngineTypes.IConfigurationSetChangeData> progress)
297298
{
298299
#pragma warning disable CA1859 // Use concrete types when possible for improved performance

services/DevHome.Services.DesiredStateConfiguration/Services/DSCOperations.cs

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public async Task ValidateConfigurationAsync(IDSCFile file)
8787
/// </summary>
8888
/// <param name="result">Result of applying the configuration set</param>
8989
/// <param name="activityId">Activity ID</param>
90+
#pragma warning disable CA1859
9091
private void ReportApplyConfigurationResult(IDSCApplicationResult result, Guid activityId)
9192
{
9293
foreach (var unitResult in result.UnitResults)

src/Strings/en-us/Resources.resw

+3
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,7 @@
292292
<data name="GPODisabledDevHomeDescription.Text" xml:space="preserve">
293293
<value>Check with your IT or System Administrator for support.</value>
294294
</data>
295+
<data name="ShellInfoBar.Message" xml:space="preserve">
296+
<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>
297+
</data>
295298
</root>

src/Views/ShellPage.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@
120120
</Grid>
121121
</NavigationView>
122122

123+
<InfoBar x:Uid="ShellInfoBar" IsOpen="True" Severity="Error" Margin="20,40,20,10"></InfoBar>
124+
123125
<StackPanel
124126
Grid.Row="1"
125127
HorizontalAlignment="Center"

tools/Dashboard/DevHome.Dashboard/ViewModels/DashboardBannerViewModel.cs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ private bool ShouldShowDashboardBanner()
4343
}
4444

4545
#if DEBUG
46+
#pragma warning disable CA1853
4647
public void ResetDashboardBanner()
4748
{
4849
ShowDashboardBanner = true;

tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ private void AddResetButton(object sender, RoutedEventArgs e)
10581058
parent.Children.Insert(index + 1, resetButton);
10591059
}
10601060

1061+
#pragma warning disable CA1853
10611062
private void ResetButton_Click(object sender, RoutedEventArgs e)
10621063
{
10631064
var roamingProperties = Windows.Storage.ApplicationData.Current.RoamingSettings.Values;

0 commit comments

Comments
 (0)