Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Commit 7654af5

Browse files
EricJohnson327EricJohnson327
authored
Merge pull request #161 from microsoft/staging
Release - 4/23/24
2 parents e22eed5 + 862d7c5 commit 7654af5

107 files changed

Lines changed: 3174 additions & 2363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DevHomeAzureExtension.sln‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A371
3737
EndProject
3838
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureExtension.Test", "test\AzureExtension\AzureExtension.Test.csproj", "{D8EFDB34-7019-4807-AE97-1B50891F345D}"
3939
EndProject
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevHome.Logging", "src\Logging\DevHome.Logging.csproj", "{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}"
41-
EndProject
4240
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{E4D6AB24-08F6-4352-9BB8-8E92148DA618}"
4341
ProjectSection(SolutionItems) = preProject
4442
test\scripts\CleanDevHome.ps1 = test\scripts\CleanDevHome.ps1
@@ -111,6 +109,7 @@ Global
111109
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|Any CPU.Deploy.0 = Debug|x64
112110
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|ARM.ActiveCfg = Debug|x64
113111
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|ARM.Build.0 = Debug|x64
112+
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|ARM.Deploy.0 = Debug|x64
114113
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|arm64.ActiveCfg = Debug|ARM64
115114
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|arm64.Build.0 = Debug|ARM64
116115
{9AEDC455-CF92-43A7-8E89-C6CA50DEC536}.Debug|arm64.Deploy.0 = Debug|ARM64
@@ -171,26 +170,6 @@ Global
171170
{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x64.Build.0 = Release|x64
172171
{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x86.ActiveCfg = Release|x86
173172
{D8EFDB34-7019-4807-AE97-1B50891F345D}.Release|x86.Build.0 = Release|x86
174-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|Any CPU.ActiveCfg = Debug|x64
175-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|Any CPU.Build.0 = Debug|x64
176-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|ARM.ActiveCfg = Debug|x64
177-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|ARM.Build.0 = Debug|x64
178-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|arm64.ActiveCfg = Debug|arm64
179-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|arm64.Build.0 = Debug|arm64
180-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x64.ActiveCfg = Debug|x64
181-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x64.Build.0 = Debug|x64
182-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x86.ActiveCfg = Debug|x86
183-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Debug|x86.Build.0 = Debug|x86
184-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|Any CPU.ActiveCfg = Release|x64
185-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|Any CPU.Build.0 = Release|x64
186-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|ARM.ActiveCfg = Release|x64
187-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|ARM.Build.0 = Release|x64
188-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|arm64.ActiveCfg = Release|arm64
189-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|arm64.Build.0 = Release|arm64
190-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x64.ActiveCfg = Release|x64
191-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x64.Build.0 = Release|x64
192-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x86.ActiveCfg = Release|x86
193-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB}.Release|x86.Build.0 = Release|x86
194173
EndGlobalSection
195174
GlobalSection(SolutionProperties) = preSolution
196175
HideSolutionNode = FALSE
@@ -202,7 +181,6 @@ Global
202181
{8E1764CB-2FFC-4F23-9FC0-BDE84E519319} = {5BDF2709-4299-49C3-B971-B10747F2925D}
203182
{A371A158-E88C-48D1-9397-22844DDC2EF4} = {10E87373-ADA7-408F-9879-0F6BF101BE87}
204183
{D8EFDB34-7019-4807-AE97-1B50891F345D} = {429CEDBA-88C4-4315-9EA1-50AB6DF8855C}
205-
{FEEEDA62-F746-4160-A3A8-1EE74137F8AB} = {5BDF2709-4299-49C3-B971-B10747F2925D}
206184
{E4D6AB24-08F6-4352-9BB8-8E92148DA618} = {429CEDBA-88C4-4315-9EA1-50AB6DF8855C}
207185
EndGlobalSection
208186
GlobalSection(ExtensibilityGlobals) = postSolution

‎build/azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ parameters:
2020
- release
2121

2222
variables:
23-
MSIXVersion: '0.700'
23+
MSIXVersion: '0.800'
2424
solution: '**/DevHomeAzureExtension.sln'
2525
appxPackageDir: 'AppxPackages'
2626
testOutputArtifactDir: 'TestResults'

‎build/scripts/CreateBuildInfo.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Param(
55
)
66

77
$Major = "0"
8-
$Minor = "7"
8+
$Minor = "8"
99
$Patch = "99" # default to 99 for local builds
1010

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

‎src/AzureExtension/AzureExtension.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Hosting;
1010
using Microsoft.Windows.DevHome.SDK;
11+
using Serilog;
1112

1213
namespace DevHomeAzureExtension;
1314

@@ -18,6 +19,7 @@ public sealed class AzureExtension : IExtension
1819
{
1920
private readonly ManualResetEvent _extensionDisposedEvent;
2021
private readonly IHost _host;
22+
private readonly ILogger _log = Log.ForContext("SourceContext", nameof(AzureExtension));
2123

2224
public AzureExtension(ManualResetEvent extensionDisposedEvent, IHost host)
2325
{
@@ -32,13 +34,13 @@ public AzureExtension(ManualResetEvent extensionDisposedEvent, IHost host)
3234
case ProviderType.DeveloperId:
3335
return DeveloperIdProvider.GetInstance();
3436
case ProviderType.Repository:
35-
return new RepositoryProvider();
37+
return RepositoryProvider.GetInstance();
3638
case ProviderType.FeaturedApplications:
3739
return new object();
3840
case ProviderType.ComputeSystem:
3941
return _host.Services.GetService<DevBoxProvider>();
4042
default:
41-
Providers.Log.Logger()?.ReportInfo("Invalid provider");
43+
_log.Information($"Invalid provider: {providerType}");
4244
return null;
4345
}
4446
}

‎src/AzureExtension/AzureExtension.csproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<Content Include="Widgets\Templates\AzureSignInTemplate.json">
4646
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4747
</Content>
48+
<Content Include="DevBox\Templates\CreationForm.json">
49+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
50+
</Content>
51+
<Content Include="DevBox\Templates\ReviewForm.json">
52+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
53+
</Content>
4854
</ItemGroup>
4955

5056
<ItemGroup>
@@ -57,18 +63,24 @@
5763
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.56.0" />
5864
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
5965
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.206-beta" />
60-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.2" />
61-
<PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.200.427" />
66+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
67+
<PackageReference Include="Microsoft.Windows.DevHome.SDK" Version="0.400.460" />
6268
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
6369
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
6470
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="16.205.1" />
6571
<PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="16.205.1" />
6672
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
6773
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
74+
<PackageReference Include="Serilog" Version="3.1.1" />
75+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
76+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
77+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
78+
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
79+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
80+
<PackageReference Include="YamlDotNet" Version="15.1.2" />
6881
</ItemGroup>
6982

7083
<ItemGroup>
71-
<ProjectReference Include="..\Logging\DevHome.Logging.csproj" />
7284
<ProjectReference Include="..\Telemetry\AzureExtension.Telemetry.csproj" />
7385
</ItemGroup>
7486

‎src/AzureExtension/Client/AzureClientHelpers.cs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.TeamFoundation.SourceControl.WebApi;
55
using Microsoft.TeamFoundation.WorkItemTracking.WebApi;
66
using Microsoft.VisualStudio.Services.WebApi;
7+
using Serilog;
78

89
namespace DevHomeAzureExtension.Client;
910

@@ -14,6 +15,7 @@ public class AzureClientHelpers
1415
// about it from the server.
1516
public static InfoResult GetQueryInfo(AzureUri azureUri, DeveloperId.DeveloperId devId)
1617
{
18+
var log = Log.ForContext("SourceContext", nameof(InfoResult));
1719
if (devId == null)
1820
{
1921
return new InfoResult(azureUri, InfoType.Query, ResultType.Failure, ErrorType.NullDeveloperId);
@@ -55,12 +57,12 @@ public static InfoResult GetQueryInfo(AzureUri azureUri, DeveloperId.DeveloperId
5557
{
5658
if (ex.InnerException is VssResourceNotFoundException)
5759
{
58-
Log.Logger()?.ReportError($"Vss Resource Not Found for {azureUri}", ex);
60+
log.Error(ex, $"Vss Resource Not Found for {azureUri}");
5961
return new InfoResult(azureUri, InfoType.Query, ResultType.Failure, ErrorType.VssResourceNotFound, ex);
6062
}
6163
else
6264
{
63-
Log.Logger()?.ReportError($"Failed getting query info for: {azureUri}", ex);
65+
log.Error(ex, $"Failed getting query info for: {azureUri}");
6466
return new InfoResult(azureUri, InfoType.Query, ResultType.Failure, ErrorType.Unknown, ex);
6567
}
6668
}
@@ -81,6 +83,7 @@ public static InfoResult GetQueryInfo(Uri uri, DeveloperId.DeveloperId devId)
8183
// about the target repository from the server.
8284
public static InfoResult GetRepositoryInfo(AzureUri azureUri, DeveloperId.DeveloperId devId)
8385
{
86+
var log = Log.ForContext("SourceContext", nameof(InfoResult));
8487
if (devId == null)
8588
{
8689
return new InfoResult(azureUri, InfoType.Repository, ResultType.Failure, ErrorType.NullDeveloperId);
@@ -122,12 +125,12 @@ public static InfoResult GetRepositoryInfo(AzureUri azureUri, DeveloperId.Develo
122125
{
123126
if (ex.InnerException is VssResourceNotFoundException)
124127
{
125-
Log.Logger()?.ReportError($"Vss Resource Not Found for {azureUri}", ex);
128+
log.Error(ex, $"Vss Resource Not Found for {azureUri}");
126129
return new InfoResult(azureUri, InfoType.Repository, ResultType.Failure, ErrorType.VssResourceNotFound, ex);
127130
}
128131
else
129132
{
130-
Log.Logger()?.ReportError($"Failed getting repository info for: {azureUri}", ex);
133+
log.Error(ex, $"Failed getting repository info for: {azureUri}");
131134
return new InfoResult(azureUri, InfoType.Repository, ResultType.Failure, ErrorType.Unknown, ex);
132135
}
133136
}

0 commit comments

Comments
 (0)