diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 7c2bdb98d..e11771fd5 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -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' diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1 index 44dd30101..42d5a01e6 100644 --- a/build/scripts/CreateBuildInfo.ps1 +++ b/build/scripts/CreateBuildInfo.ps1 @@ -6,7 +6,7 @@ Param( ) $Major = "0" -$Minor = "19" +$Minor = "20" $Patch = "99" # default to 99 for local builds $versionSplit = $Version.Split("."); diff --git a/build/scripts/Unstub.ps1 b/build/scripts/Unstub.ps1 index 7888f1491..1bac58ffd 100644 --- a/build/scripts/Unstub.ps1 +++ b/build/scripts/Unstub.ps1 @@ -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 -# e.g. -$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 -$packagesNode = $xml.SelectSingleNode("/packages") -$packagesNode.AppendChild($packageNode) - -# Save -$xml.Save($packagesConfig) diff --git a/extensions/HyperVExtension/src/DevSetupEngine/ConfigurationFileHelper.cs b/extensions/HyperVExtension/src/DevSetupEngine/ConfigurationFileHelper.cs index 244a60ec5..94f4f90e7 100644 --- a/extensions/HyperVExtension/src/DevSetupEngine/ConfigurationFileHelper.cs +++ b/extensions/HyperVExtension/src/DevSetupEngine/ConfigurationFileHelper.cs @@ -293,6 +293,7 @@ private async Task InstallOrUpdateAppInstallerIfNeeded(IProgress ApplyConfigurationAsync(string content, IProgress progress) { DevSetupEngineTypes.IOpenConfigurationSetResult? openConfigurationSetResult = default; diff --git a/services/DevHome.Services.DesiredStateConfiguration/Services/DSCOperations.cs b/services/DevHome.Services.DesiredStateConfiguration/Services/DSCOperations.cs index 4318cfb25..fef613f69 100644 --- a/services/DevHome.Services.DesiredStateConfiguration/Services/DSCOperations.cs +++ b/services/DevHome.Services.DesiredStateConfiguration/Services/DSCOperations.cs @@ -87,6 +87,7 @@ public async Task ValidateConfigurationAsync(IDSCFile file) /// /// Result of applying the configuration set /// Activity ID + #pragma warning disable CA1859 private void ReportApplyConfigurationResult(IDSCApplicationResult result, Guid activityId) { foreach (var unitResult in result.UnitResults) diff --git a/src/Strings/en-us/Resources.resw b/src/Strings/en-us/Resources.resw index d2d5a36b8..88799a12e 100644 --- a/src/Strings/en-us/Resources.resw +++ b/src/Strings/en-us/Resources.resw @@ -292,4 +292,7 @@ Check with your IT or System Administrator for support. + + 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. + \ No newline at end of file diff --git a/src/Views/ShellPage.xaml b/src/Views/ShellPage.xaml index d52fe5769..4c29c28b6 100644 --- a/src/Views/ShellPage.xaml +++ b/src/Views/ShellPage.xaml @@ -120,6 +120,8 @@ + +