Skip to content
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.

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

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #45266

Merged
merged 85 commits into from
Dec 10, 2024
Merged
Changes from 3 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
24bed47
Merged PR 43124: [internal/release/8.0.3xx] Update dependencies from …
Sep 24, 2024
a461944
Merge commit 'f81a95ba275e1b946629e3f3f4bbcb4da54910cb'
Oct 2, 2024
ee59a10
Merged PR 43911: [internal/release/8.0.3xx] Merge from public
vseanreesermsft Oct 17, 2024
c85dc1e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
b9adb86
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
a2e1aa1
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
c684f99
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
f0a49a7
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
6ee43ef
Merged PR 43934: [internal/release/8.0.3xx] Update dependencies from …
Oct 21, 2024
4b4ba04
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
73e797c
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
07eb260
Merged PR 44077: [internal/release/8.0.3xx] Update dependencies from …
Oct 22, 2024
cbec7e9
Merge commit '07eb260e98358c3a5597449dd32ee81112acb5e4' into internal…
vseanreesermsft Nov 12, 2024
a369d53
Fix the template tests
marcpopMSFT Nov 12, 2024
f4c27cf
Merging internal commits for release/8.0.3xx (#44821)
marcpopMSFT Nov 13, 2024
43bdf1b
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
716c6b6
[release/8.0.3xx] Update dependencies from dotnet/arcade (#44873)
v-wuzhai Nov 15, 2024
90a4246
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 15, 2024
6adf982
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 16, 2024
7fb5f08
Add COM workaround
joeloff Nov 19, 2024
3011043
[release/8.0.3xx] Update dependencies from dotnet/razor (#44904)
joeloff Nov 19, 2024
e3160d2
[release/8.0.3xx] Update dependencies from dotnet/templating (#44889)
marcpopMSFT Nov 19, 2024
aa6668e
Increment branding to allow for post-GA hotfixes
marcpopMSFT Nov 20, 2024
612c99f
Remove AspNET substraction logic
marcpopMSFT Nov 20, 2024
065a573
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 21, 2024
f3b5ba0
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 23, 2024
9e67da5
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 23, 2024
06650cd
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 23, 2024
18ea0eb
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 23, 2024
8e386bb
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 24, 2024
330cb86
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Nov 24, 2024
2c2ba26
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 24, 2024
6cd589d
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 24, 2024
b82cb30
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 24, 2024
89d5053
[release/8.0.3xx] Update dependencies from dotnet/roslyn (#45085)
joeloff Nov 24, 2024
657e60e
[release/8.0.3xx] Update dependencies from dotnet/razor (#45084)
joeloff Nov 24, 2024
0394c68
Work around COM concurrency issue when accessing VS instances
joeloff Nov 25, 2024
98e8d8d
[release/8.0.4xx] Update dependencies from dotnet/razor (#45088)
joeloff Nov 25, 2024
090d3b9
[release/8.0.3xx] Update dependencies from dotnet/templating (#45086)
v-wuzhai Nov 25, 2024
b2ff361
[release/8.0.3xx] Update dependencies from dotnet/arcade (#45064)
v-wuzhai Nov 25, 2024
578ae1f
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into …
v-wuzhai Nov 25, 2024
db24e1d
[release/8.0.4xx] Update dependencies from dotnet/templating (#45087)
v-wuzhai Nov 25, 2024
4958565
[release/8.0.4xx] Update dependencies from dotnet/arcade (#45065)
v-wuzhai Nov 25, 2024
5a5ced8
[release/9.0.1xx] Update dependencies from dotnet/arcade (#45068)
v-wuzhai Nov 25, 2024
e1fdfc7
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 25, 2024
c400fb5
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#45091)
v-wuzhai Nov 25, 2024
ef24df7
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 25, 2024
2f86240
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 25, 2024
181047a
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 25, 2024
f9471f3
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 25, 2024
57a772d
Increment branding to allow for post-GA hotfixes (#44994)
marcpopMSFT Nov 25, 2024
8c7e583
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
nagilson Nov 25, 2024
43a950d
[release/9.0.1xx] Update dependencies from dotnet/templating (#45025)
nagilson Nov 25, 2024
b0310a3
[release/8.0.4xx] Update dependencies from dotnet/templating (#45106)
nagilson Nov 25, 2024
5555202
Remove AspNET substraction logic (#44995)
marcpopMSFT Nov 25, 2024
79b7fc1
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Nov 26, 2024
5442f8a
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#45118)
v-wuzhai Nov 26, 2024
b1a6b1d
Update dependencies from https://github.com/dotnet/sourcelink build 2…
dotnet-maestro[bot] Nov 26, 2024
6e30335
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Nov 26, 2024
88e03ee
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 26, 2024
736aaa4
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 26, 2024
80678a6
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
marcpopMSFT Nov 26, 2024
474afbe
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-2886949c-576…
nagilson Nov 26, 2024
e7e0dbe
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-7a5d6bdf-f5e…
nagilson Nov 26, 2024
2f3c678
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-dcbcbac0-8f0…
nagilson Nov 26, 2024
35b333c
[release/9.0.1xx] Update dependencies from dotnet/source-build-extern…
nagilson Nov 27, 2024
933be0e
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#45142)
nagilson Nov 27, 2024
d281819
[release/9.0.1xx] Update dependencies from dotnet/razor (#45157)
nagilson Nov 27, 2024
9150eca
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 27, 2024
1af22ec
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 27, 2024
6f2583a
Update dependencies from https://github.com/dotnet/sourcelink build 2…
dotnet-maestro[bot] Nov 27, 2024
e54dcee
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 27, 2024
18bb771
[release/9.0.1xx] [Blazor] Fix hot reload for components with colloca…
github-actions[bot] Nov 27, 2024
b0ed0bc
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#45191)
v-wuzhai Nov 28, 2024
5040911
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
v-wuzhai Nov 28, 2024
9a36fab
[release/9.0.1xx] Update dependencies from dotnet/templating (#45170)
v-wuzhai Nov 28, 2024
2790903
Update dependencies from https://github.com/dotnet/sourcelink build 2…
dotnet-maestro[bot] Nov 28, 2024
aea4f63
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Nov 28, 2024
622c5ac
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
v-wuzhai Nov 29, 2024
cbec38b
[release/9.0.1xx] Update dependencies from dotnet/sourcelink (#45210)
v-wuzhai Nov 29, 2024
7b747a8
Update dependencies from https://github.com/dotnet/test-templates bui…
dotnet-maestro[bot] Dec 2, 2024
cab7c0a
[release/9.0.1xx] Update dependencies from dotnet/test-templates (#45…
nagilson Dec 2, 2024
354cc45
Update dependencies from https://github.com/dotnet/fsharp build 20241…
dotnet-maestro[bot] Dec 3, 2024
1010c37
[release/9.0.1xx] Update dependencies from dotnet/fsharp (#45261)
T-Gro Dec 3, 2024
f2413f3
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
v-wuzhai Dec 3, 2024
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
6 changes: 3 additions & 3 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -293,16 +293,16 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>47576478939fdd59b4400ad135f47938af486ab3</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24565.7">
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24574.4">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>b4ba32397a657a228890b10fd6cd84c9fa7035a8</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24565.7">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24574.4">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>b4ba32397a657a228890b10fd6cd84c9fa7035a8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24565.7">
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24574.4">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>b4ba32397a657a228890b10fd6cd84c9fa7035a8</Sha>
</Dependency>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -179,9 +179,9 @@
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
<PropertyGroup>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24565.7</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24565.7</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24565.7</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24574.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24574.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24574.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@ namespace Microsoft.DotNet.Workloads.Workload
#endif
internal static class VisualStudioWorkloads
{
private static readonly object s_guard = new();

private const int REGDB_E_CLASSNOTREG = unchecked((int)0x80040154);

/// <summary>
@@ -164,44 +166,50 @@ internal static IEnumerable<WorkloadId> WriteSDKInstallRecordsForVSWorkloads(IIn
/// <returns>A list of Visual Studio instances.</returns>
private static List<ISetupInstance> GetVisualStudioInstances()
{
List<ISetupInstance> vsInstances = new();

try
// The underlying COM API has a bug where-by it's not safe for concurrent calls. Until their
// bug fix is rolled out use a lock to ensure we don't concurrently access this API.
// https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2241752/
lock (s_guard)
{
SetupConfiguration setupConfiguration = new();
ISetupConfiguration2 setupConfiguration2 = setupConfiguration;
IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances();
ISetupInstance[] instances = new ISetupInstance[1];
int fetched = 0;
List<ISetupInstance> vsInstances = new();

do
try
{
setupInstances.Next(1, instances, out fetched);
SetupConfiguration setupConfiguration = new();
ISetupConfiguration2 setupConfiguration2 = setupConfiguration;
IEnumSetupInstances setupInstances = setupConfiguration2.EnumInstances();
ISetupInstance[] instances = new ISetupInstance[1];
int fetched = 0;

if (fetched > 0)
do
{
ISetupInstance2 instance = (ISetupInstance2)instances[0];
setupInstances.Next(1, instances, out fetched);

// .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs
// such as community, professional, and enterprise.
if (Version.TryParse(instance.GetInstallationVersion(), out Version version) &&
version.Major >= 17 &&
s_visualStudioProducts.Contains(instance.GetProduct().GetId()))
if (fetched > 0)
{
vsInstances.Add(instances[0]);
ISetupInstance2 instance = (ISetupInstance2)instances[0];

// .NET Workloads only shipped in 17.0 and later and we should only look at IDE based SKUs
// such as community, professional, and enterprise.
if (Version.TryParse(instance.GetInstallationVersion(), out Version version) &&
version.Major >= 17 &&
s_visualStudioProducts.Contains(instance.GetProduct().GetId()))
{
vsInstances.Add(instances[0]);
}
}
}
while (fetched > 0);

}
catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG)
{
// Query API not registered, good indication there are no VS installations of 15.0 or later.
// Other exceptions are passed through since that likely points to a real error.
}
while (fetched > 0);

return vsInstances;
}
catch (COMException e) when (e.ErrorCode == REGDB_E_CLASSNOTREG)
{
// Query API not registered, good indication there are no VS installations of 15.0 or later.
// Other exceptions are passed through since that likely points to a real error.
}

return vsInstances;
}
}
}
Loading