Skip to content

Commit 0162c4c

Browse files
nagilsonnagilson
authored
Merge branch 'main' into darc-main-21bb1e3f-96a4-44a7-a57b-17abf8806860
2 parents b00fb21 + 88354f4 commit 0162c4c

File tree

17 files changed

+11604
-231
lines changed

17 files changed

+11604
-231
lines changed

‎CODEOWNERS

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
5353

5454
# Area-Templates
55-
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
56-
/src/Cli/dotnet-new3 @dotnet/templating-engine-maintainers
57-
/src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
55+
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
56+
/src/Cli/dotnet-new3 @dotnet/templating-engine-maintainers
57+
/src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
5858
/test/dotnet-new.Tests @dotnet/templating-engine-maintainers
59-
/test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
60-
/template_feed @dotnet/templating-engine-maintainers
59+
/test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
60+
/template_feed @dotnet/templating-engine-maintainers
6161

6262
# ILLink and ReadyToRun targets and tasks owned by runtime team
6363
# Area-ILLink Area-ReadyToRun
@@ -72,12 +72,12 @@
7272
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
7373

7474
# Area-Watch
75-
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
76-
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
77-
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
78-
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide
79-
/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
80-
/src/BuiltInTools/AspireService @BillHiebert @dotnet/aspnet-blazor-eng
75+
/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
76+
/test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
77+
/test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
78+
/src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide
79+
/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
80+
/src/BuiltInTools/AspireService @BillHiebert @dotnet/aspnet-blazor-eng
8181

8282
# Compatibility tools owned by runtime team
8383
/src/Compatibility/ @dotnet/area-infrastructure-libraries
@@ -86,10 +86,10 @@
8686
/test/Microsoft.DotNet.PackageValidation*/ @dotnet/area-infrastructure-libraries
8787

8888
# Area-GenAPI
89-
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
90-
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries @andriipatsula
91-
/test/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries @andriipatsula
92-
/test/Microsoft.DotNet.ApiSymbolExtensions.Tests/
89+
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries
90+
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries
91+
/test/Microsoft.DotNet.GenAPI/ @dotnet/area-infrastructure-libraries
92+
/test/Microsoft.DotNet.ApiSymbolExtensions.Tests/ @dotnet/area-infrastructure-libraries
9393

9494
# Area: dotnet containers
9595
/src/Cli/Containers @dotnet/sdk-container-builds-maintainers

‎Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<PackageVersion Include="Microsoft.TemplateSearch.Common" Version="$(MicrosoftTemplateSearchCommonPackageVersion)" />
6464
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
6565
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
66-
<PackageVersion Include="Microsoft.VisualBasic" Version="$(MicrosoftVisualBasicVersion)" />
6766
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6867
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
6968
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
@@ -91,7 +90,6 @@
9190
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9291
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
9392
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
94-
<PackageVersion Include="System.Collections.Specialized" Version="$(SystemCollectionsSpecializedPackageVersion)" />
9593
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
9694
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
9795
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
@@ -115,7 +113,6 @@
115113
<PackageVersion Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
116114
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonPackageVersion)" />
117115
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
118-
<PackageVersion Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" />
119116
<PackageVersion Include="Valleysoft.DockerCredsProvider" Version="2.2.1" />
120117
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
121118
<PackageVersion Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />

‎eng/ManualVersions.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.31</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.31</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.31</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
1819
</PropertyGroup>
1920

2021
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747

4848
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
4949
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
50+
51+
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
52+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
5053
</IgnorePatterns>
5154

5255
</UsageData>

0 commit comments

Comments
 (0)