Skip to content

Commit 7e938b1

Browse files
Merge pull request #11415 from dotnet/main
Merge main into live
2 parents 3753eb9 + 8f8d032 commit 7e938b1

File tree

1,665 files changed

+46172
-120768
lines changed

Some content is hidden

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

1,665 files changed

+46172
-120768
lines changed

docfx.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
"api/Microsoft.Activities**.yml": "microsoft.activities",
8989
"api/Microsoft.Build**.yml": "microsoft.build",
9090
"api/Microsoft.CSharp**.yml": "microsoft.csharp",
91+
"api/Microsoft.Extensions**.yml": "microsoft.extensions",
9192
"api/Microsoft.JScript**.yml": "microsoft.jscript",
9293
"api/Microsoft.SqlServer**.yml": "microsoft.sqlserver",
9394
"api/Microsoft.VisualBasic**.yml": "microsoft.visualbasic",
@@ -100,6 +101,7 @@
100101
"api/System.Buffers**.yml": "system.buffers",
101102
"api/System.CodeDom**.yml": "system.codedom",
102103
"api/System.Collections**.yml": "system.collections",
104+
"api/System.CommandLine**.yml": "system.commandline",
103105
"api/System.ComponentModel**.yml": "system.componentmodel",
104106
"api/System.Composition**.yml": "system.composition",
105107
"api/System.Configuration**.yml": "system.configuration",
@@ -111,6 +113,7 @@
111113
"api/System.Drawing**.yml": "system.drawing",
112114
"api/System.Dynamic**.yml": "system.dynamic",
113115
"api/System.EnterpriseServices**.yml": "system.enterpriseservices",
116+
"api/System.Formats**.yml": "system.formats",
114117
"api/System.Globalization**.yml": "system.globalization",
115118
"api/System.IdentityModel**.yml": "system.identitymodel",
116119
"api/System.IO**.yml": "system.io",
@@ -139,6 +142,7 @@
139142
"api/System.Xaml**.yml": "system.xaml",
140143
"api/System.Xml**.yml": "system.xml",
141144
"api/UIAutomationClientsideProviders**.yml": "uiautomationclientsideproviders",
145+
"api/Windows.UI**.yml": "windows.ui",
142146
"api/XamlGeneratedNamespace**.yml": "xamlgeneratednamespace"
143147
},
144148
"langs": {

snippets/cpp/VS_Snippets_CLR/CertInfo/CPP/certinfo.cpp

Lines changed: 0 additions & 80 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CertSelect/CPP/certselect.cpp

Lines changed: 0 additions & 47 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CipherReference2/CPP/example.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CompareInfo/cpp/CompareInfo.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CounterCreationDataCollection_AddRange/CPP/countercreationdatacollection_addrange.cpp

Lines changed: 0 additions & 65 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CounterCreationDataCollection_Contains/CPP/countercreationdatacollection_contains.cpp

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)