Skip to content

Commit 10720ba

Browse files
lucasnobredevmairaw
authored andcommitted
Suggest to combine C# and VB sections into a single .NET Guide (dotnet#6404)
* first try * fixes by rpetrusha review * review comment * more comment review * fixes after maira's review * incorrect link fixed * another incorrect link * file format rename * file format rename in toc.md * fixing links to file-format * incoming links to old assembly/index * fix by open publishing build service * include visual basic links temporarily to see also section * fix in xref * fixes by ron reviews * Update index.md
1 parent 660aaa3 commit 10720ba

35 files changed

+101
-143
lines changed

.openpublishing.redirection.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,11 @@
430430
"source_path": "docs/csharp/programming-guide/concepts/async/asynchronous-programming-with-async-and-await.md",
431431
"redirect_url": "/dotnet/csharp/async/"
432432
},
433+
{
434+
"source_path": "docs/csharp/programming-guide/concepts/assemblies-gac/index.md",
435+
"redirect_url": "/dotnet/standard/assembly",
436+
"redirect_document_id":true
437+
},
433438
{
434439
"source_path": "docs/csharp/programming-guide/concepts/linq/cloning-vs-attaching.md",
435440
"redirect_url": "/dotnet/csharp/programming-guide/concepts/linq/creating-xml-trees-linq-to-xml-2#attaching-vs-cloning"
@@ -2267,6 +2272,10 @@
22672272
"source_path": "docs/visual-basic/misc/next-control-variable-does-not-match-for-loop-control-variable.md",
22682273
"redirect_url": "/dotnet/visual-basic/language-reference/error-messages/index"
22692274
},
2275+
{
2276+
"source_path": "docs/visual-basic/programming-guide/concepts/assemblies-gac/index.md",
2277+
"redirect_url": "/dotnet/standard/assembly"
2278+
},
22702279
{
22712280
"source_path": "docs/visual-basic/programming-guide/concepts/covariance-contravariance/covariance-and-contravariance.md",
22722281
"redirect_url": "/dotnet/visual-basic/programming-guide/concepts/covariance-contravariance/index",

docs/core/deploying/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ For an FDD, you deploy only your app and third-party dependencies. Your app will
2424

2525
Deploying an FDD has a number of advantages:
2626

27-
- You don't have to define the target operating systems that your .NET Core app will run on in advance. Because .NET Core uses a common PE file format for executables and libraries regardless of operating system, .NET Core can execute your app regardless of the underlying operating system. For more information on the PE file format, see [.NET Assembly File Format](../../standard/assembly-format.md).
27+
- You don't have to define the target operating systems that your .NET Core app will run on in advance. Because .NET Core uses a common PE file format for executables and libraries regardless of operating system, .NET Core can execute your app regardless of the underlying operating system. For more information on the PE file format, see [.NET Assembly File Format](../../standard/assembly/file-format.md).
2828

2929
- The size of your deployment package is small. You only deploy your app and its dependencies, not .NET Core itself.
3030

docs/csharp/language-reference/keywords/internal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class BaseClass
2727

2828
For a comparison of `internal` with the other access modifiers, see [Accessibility Levels](../../../csharp/language-reference/keywords/accessibility-levels.md) and [Access Modifiers](../../../csharp/programming-guide/classes-and-structs/access-modifiers.md).
2929

30-
For more information about assemblies, see [Assemblies and the Global Assembly Cache](../../../csharp/programming-guide/concepts/assemblies-gac/index.md).
30+
For more information about assemblies, see [Assemblies in .NET](../../../standard/assembly/index.md).
3131

3232
A common use of internal access is in component-based development because it enables a group of components to cooperate in a private manner without being exposed to the rest of the application code. For example, a framework for building graphical user interfaces could provide `Control` and `Form` classes that cooperate by using members with internal access. Since these members are internal, they are not exposed to code that is using the framework.
3333

docs/csharp/programming-guide/concepts/assemblies-gac/friend-assemblies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@ public class ClassWithFriendMethod
7070
- <xref:System.Security.Permissions.StrongNameIdentityPermission>
7171
- [How to: Create Unsigned Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/how-to-create-unsigned-friend-assemblies.md)
7272
- [How to: Create Signed Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/how-to-create-signed-friend-assemblies.md)
73-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
73+
- [Assemblies in .NET](../../../../standard/assembly/index.md)
7474
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)

docs/csharp/programming-guide/concepts/assemblies-gac/how-to-create-and-use-assemblies-using-the-command-line.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,5 @@ csc /out:TestCode.exe /reference:MathLibrary.DLL TestCode.cs
119119
## See also
120120

121121
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)
122-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
122+
- [Assemblies in .NET](../../../../standard/assembly/index.md)
123123
- [Creating a Class to Hold DLL Functions](../../../../framework/interop/creating-a-class-to-hold-dll-functions.md)

docs/csharp/programming-guide/concepts/assemblies-gac/how-to-create-signed-friend-assemblies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ This example shows how to use friend assemblies with assemblies that have strong
8585
## See also
8686

8787
- <xref:System.Runtime.CompilerServices.InternalsVisibleToAttribute>
88-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
88+
- [Assemblies in .NET](../../../../standard/assembly/index.md)
8989
- [Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/friend-assemblies.md)
9090
- [How to: Create Unsigned Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/how-to-create-unsigned-friend-assemblies.md)
9191
- [/keyfile](../../../../csharp/language-reference/compiler-options/keyfile-compiler-option.md)

docs/csharp/programming-guide/concepts/assemblies-gac/how-to-create-unsigned-friend-assemblies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ This example shows how to use friend assemblies with assemblies that are unsigne
8787
## See also
8888

8989
- <xref:System.Runtime.CompilerServices.InternalsVisibleToAttribute>
90-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
90+
- [Assemblies in .NET](../../../../standard/assembly/index.md)
9191
- [Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/friend-assemblies.md)
9292
- [How to: Create Signed Friend Assemblies (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/how-to-create-signed-friend-assemblies.md)
9393
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)

docs/csharp/programming-guide/concepts/assemblies-gac/how-to-determine-if-a-file-is-an-assembly.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ class TestAssembly
6464

6565
- <xref:System.Reflection.AssemblyName>
6666
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)
67-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
67+
- [Assemblies in .NET](../../../../standard/assembly/index.md)

docs/csharp/programming-guide/concepts/assemblies-gac/how-to-load-and-unload-assemblies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ The assemblies referenced by your program will automatically be loaded at build
2121
## See also
2222

2323
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)
24-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
24+
- [Assemblies in .NET](../../../../standard/assembly/index.md)
2525
- [How to: Load Assemblies into an Application Domain](../../../../framework/app-domains/how-to-load-assemblies-into-an-application-domain.md)

docs/csharp/programming-guide/concepts/assemblies-gac/index.md

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

docs/csharp/programming-guide/concepts/assemblies-gac/walkthrough-embedding-types-from-managed-assemblies-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,4 @@ If you embed type information from a strong-named managed assembly, you can loos
231231
- [/link (C# Compiler Options)](../../../../csharp/language-reference/compiler-options/link-compiler-option.md)
232232
- [C# Programming Guide](../../../../csharp/programming-guide/index.md)
233233
- [Programming with Assemblies](../../../../framework/app-domains/programming-with-assemblies.md)
234-
- [Assemblies and the Global Assembly Cache (C#)](../../../../csharp/programming-guide/concepts/assemblies-gac/index.md)
234+
- [Assemblies in .NET](../../../../standard/assembly/index.md)

docs/csharp/programming-guide/concepts/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This section explains programming concepts in the C# language.
1010

1111
|Title|Description|
1212
|-----------|-----------------|
13-
|[Assemblies and the Global Assembly Cache (C#)](../../../csharp/programming-guide/concepts/assemblies-gac/index.md)|Describes how to create and use assemblies.|
13+
|[Assemblies in .NET](../../../standard/assembly/index.md)|Describes how to create and use assemblies.|
1414
|[Asynchronous Programming with async and await (C#)](../../../csharp/programming-guide/concepts/async/index.md)|Describes how to write asynchronous solutions by using the [async](../../../csharp/language-reference/keywords/async.md) and [await](../../../csharp/language-reference/keywords/await.md) keywords in C#. Includes a walkthrough.|
1515
|[Attributes (C#)](../../../csharp/programming-guide/concepts/attributes/index.md)|Discusses how to provide additional information about programming elements such as types, fields, methods, and properties by using attributes.|
1616
|[Caller Information (C#)](../../../csharp/programming-guide/concepts/caller-information.md)|Describes how to obtain information about the caller of a method. This information includes the file path and the line number of the source code and the member name of the caller.|

docs/csharp/programming-guide/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This section provides detailed information on key C# language features and featu
6565
## Platform Sections
6666
[Application Domains](../../framework/app-domains/application-domains.md)
6767

68-
[Assemblies and the Global Assembly Cache](../../csharp/programming-guide/concepts/assemblies-gac/index.md)
68+
[Assemblies in .NET](../../standard/assembly/index.md)
6969

7070
[Attributes](../../csharp/programming-guide/concepts/attributes/index.md)
7171

docs/standard/assembly-format.md renamed to docs/standard/assembly/file-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The .NET assembly format is also very descriptive about the structure of a given
2323

2424
The .NET binary format is based on the Windows [PE file](https://en.wikipedia.org/wiki/Portable_Executable) format. In fact, .NET class libraries are conformant Windows PEs, and appear on first glance to be Windows dynamic link libraries (DLLs) or application executables (EXEs). This is a very useful characteristic on Windows, where they can masquerade as native executable binaries and get some of the same treatment (for example, OS load, PE tools).
2525

26-
![Assembly headers](./media/assembly-format/assembly-headers.png)
26+
![Assembly headers](../media/assembly-format/assembly-headers.png)
2727

2828
Assembly Headers from ECMA 335 II.25.1, Structure of the runtime file format.
2929

0 commit comments

Comments
 (0)