From a0360360ba47148d882114a8cd63a7ead2d2860c Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 10 Mar 2021 08:18:01 -0800 Subject: [PATCH] update hard links to master --- docs/core/tools/using-ci-with-cli.md | 2 +- docs/fsharp/language-reference/compiler-messages/index.md | 2 +- docs/standard/data/sqlite/collation.md | 2 +- docs/standard/data/sqlite/extensions.md | 2 +- docs/standard/data/sqlite/in-memory-databases.md | 2 +- docs/whats-new/index.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/core/tools/using-ci-with-cli.md b/docs/core/tools/using-ci-with-cli.md index eb765012b4e96..67bd5bdc171b2 100644 --- a/docs/core/tools/using-ci-with-cli.md +++ b/docs/core/tools/using-ci-with-cli.md @@ -120,7 +120,7 @@ Travis CI runs both macOS and Linux jobs in a *build matrix*, where you specify ### AppVeyor -[AppVeyor](https://www.appveyor.com/) installs the .NET Core 1.0.1 SDK with the `Visual Studio 2017` build worker image. Other build images with different versions of the .NET SDK are available. For more information, see the [appveyor.yml example](https://github.com/dotnet/docs/blob/master/appveyor.yml) and the [Build worker images](https://www.appveyor.com/docs/build-environment/#build-worker-images) article in the AppVeyor docs. +[AppVeyor](https://www.appveyor.com/) installs the .NET Core 1.0.1 SDK with the `Visual Studio 2017` build worker image. Other build images with different versions of the .NET SDK are available. For more information, see the [appveyor.yml example](https://github.com/dotnet/docs/blob/main/appveyor.yml) and the [Build worker images](https://www.appveyor.com/docs/build-environment/#build-worker-images) article in the AppVeyor docs. The .NET SDK binaries are downloaded and unzipped in a subdirectory using the install script, and then they're added to the `PATH` environment variable. Add a build matrix to run integration tests with multiple versions of the .NET SDK: diff --git a/docs/fsharp/language-reference/compiler-messages/index.md b/docs/fsharp/language-reference/compiler-messages/index.md index c7bd079b6cd64..57b2086e909d7 100644 --- a/docs/fsharp/language-reference/compiler-messages/index.md +++ b/docs/fsharp/language-reference/compiler-messages/index.md @@ -15,7 +15,7 @@ This section details compiler errors and warnings that the F# compiler will emit If a particular warning or error is not yet recorded in this section: - Go to the end of this page and send feedback that includes the number or text of the error, or -- Add it yourself by following the instructions in [create-new-fsharp-compiler-message.fsx](https://github.com/dotnet/docs/blob/master/docs/fsharp/language-reference/compiler-messages/util/create-new-fsharp-compiler-message.fsx) and opening a pull request for this repository. +- Add it yourself by following the instructions in [create-new-fsharp-compiler-message.fsx](https://github.com/dotnet/docs/blob/main/docs/fsharp/language-reference/compiler-messages/util/create-new-fsharp-compiler-message.fsx) and opening a pull request for this repository. ## See also diff --git a/docs/standard/data/sqlite/collation.md b/docs/standard/data/sqlite/collation.md index 3f1ddb99f2e88..79fc6811195fb 100644 --- a/docs/standard/data/sqlite/collation.md +++ b/docs/standard/data/sqlite/collation.md @@ -15,7 +15,7 @@ Collating sequences are used by SQLite when comparing TEXT values to determine o ## Custom collation -You can also define your own collating sequences or override the built-in ones using . The following example shows overriding the NOCASE collation to support Unicode characters. The [full sample code](https://github.com/dotnet/docs/blob/master/samples/snippets/standard/data/sqlite/CollationSample/Program.cs) is available on GitHub. +You can also define your own collating sequences or override the built-in ones using . The following example shows overriding the NOCASE collation to support Unicode characters. The [full sample code](https://github.com/dotnet/docs/blob/main/samples/snippets/standard/data/sqlite/CollationSample/Program.cs) is available on GitHub. [!code-csharp[](../../../../samples/snippets/standard/data/sqlite/CollationSample/Program.cs?name=snippet_Collation)] diff --git a/docs/standard/data/sqlite/extensions.md b/docs/standard/data/sqlite/extensions.md index f027a18fdf204..4b747c547e8c3 100644 --- a/docs/standard/data/sqlite/extensions.md +++ b/docs/standard/data/sqlite/extensions.md @@ -7,7 +7,7 @@ description: Learn how to load SQLite extensions. SQLite supports loading extensions at run time. Extensions include things like additional SQL functions, collations, virtual tables, and more. -.NET Core includes additional logic for locating native libraries in additional places like referenced NuGet packages. Unfortunately, SQLite can't leverage this logic; it calls the platform API directly to load libraries. Because of this, you may need to modify the PATH, LD_LIBRARY_PATH, or DYLD_LIBRARY_PATH environment variables before loading SQLite extensions. There's [a sample](https://github.com/dotnet/docs/blob/master/samples/snippets/standard/data/sqlite/ExtensionsSample/Program.cs) on GitHub that demonstrates finding binaries for the current runtime inside a referenced NuGet package. +.NET Core includes additional logic for locating native libraries in additional places like referenced NuGet packages. Unfortunately, SQLite can't leverage this logic; it calls the platform API directly to load libraries. Because of this, you may need to modify the PATH, LD_LIBRARY_PATH, or DYLD_LIBRARY_PATH environment variables before loading SQLite extensions. There's [a sample](https://github.com/dotnet/docs/blob/main/samples/snippets/standard/data/sqlite/ExtensionsSample/Program.cs) on GitHub that demonstrates finding binaries for the current runtime inside a referenced NuGet package. To load an extension, call the method. Microsoft.Data.Sqlite will ensure that the extension remains loaded even if the connection is closed and reopened. diff --git a/docs/standard/data/sqlite/in-memory-databases.md b/docs/standard/data/sqlite/in-memory-databases.md index 977a049297fc9..53f7ce941401d 100644 --- a/docs/standard/data/sqlite/in-memory-databases.md +++ b/docs/standard/data/sqlite/in-memory-databases.md @@ -13,7 +13,7 @@ Data Source=:memory: ## Shareable in-memory databases -In-memory databases can be shared between multiple connections by using `Mode=Memory` and `Cache=Shared` in the connection string. The `Data Source` keyword is used to give the in-memory database a name. Connection strings using the same name will access the same in-memory database. The database persists as long as at least one connection to it remains open. A [sample](https://github.com/dotnet/docs/blob/master/samples/snippets/standard/data/sqlite/InMemorySample/Program.cs) demonstrating this is available on GitHub. +In-memory databases can be shared between multiple connections by using `Mode=Memory` and `Cache=Shared` in the connection string. The `Data Source` keyword is used to give the in-memory database a name. Connection strings using the same name will access the same in-memory database. The database persists as long as at least one connection to it remains open. A [sample](https://github.com/dotnet/docs/blob/main/samples/snippets/standard/data/sqlite/InMemorySample/Program.cs) demonstrating this is available on GitHub. ```connectionstring Data Source=InMemorySample;Mode=Memory;Cache=Shared diff --git a/docs/whats-new/index.yml b/docs/whats-new/index.yml index 1d6dfd8156626..14bd1a21fda22 100644 --- a/docs/whats-new/index.yml +++ b/docs/whats-new/index.yml @@ -39,7 +39,7 @@ landingContent: - linkListType: overview links: - text: .NET docs repository - url: https://github.com/dotnet/docs/blob/master/README.md + url: https://github.com/dotnet/docs/blob/main/README.md - text: Project structure and labels for issues and pull requests url: /contribute/dotnet/labels-projects - text: .NET Foundation