Skip to content

Commit

Permalink
Update branch names in workflows and links (#4427)
Browse files Browse the repository at this point in the history
* Update branch names in workflows and links

See #4400

For each link, I checked to see if the destination branch had been renamed. Where the branch has been renamed, the link has been updated.

* revert change to this file.

It was in error in find / replace.

* revert changes made in error

Find / replace error

* remove outdated workflow

* add workflow dispatch trigger
  • Loading branch information
BillWagner committed Mar 9, 2021
1 parent 0f3b73e commit 67d34f2
Show file tree
Hide file tree
Showing 23 changed files with 612 additions and 680 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
@@ -1,5 +1,5 @@
# generated by dependadotnet
# https://github.com/dotnet/core/tree/master/samples/dependadotnet
# https://github.com/dotnet/core/tree/main/samples/dependadotnet
version: 2
updates:
- package-ecosystem: "nuget"
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/build-validation.yml
Expand Up @@ -2,7 +2,7 @@
name: Snippets 5000

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the main branch
on:
pull_request:
paths:
Expand All @@ -19,7 +19,13 @@ on:
- "**.sln"
- "**global.json"
- "**snippets.5000.json"
branches: [ master ]
branches: [ main ]
workflow_dispatch:
inputs:
reason:
description: 'The reason for running the workflow'
required: true
default: 'Force a snippets build'

env:
DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version-sweep.yml
Expand Up @@ -4,7 +4,7 @@ name: 'target supported version'

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
# Triggers the workflow on push or pull request events but only for the main branch
schedule:
- cron: '0 0 1 * *'
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -50,7 +50,7 @@ If you wish to add a code sample:

1. Your sample **must be part of a buildable project**. Where possible, the projects should build on all platforms supported by .NET Core. Exceptions to this are samples that demonstrate a platform-specific feature or platform-specific tool.

2. Your sample should conform to the [runtime coding style](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md) to maintain consistency.
2. Your sample should conform to the [runtime coding style](https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md) to maintain consistency.

- Additionally, we prefer the use of `static` methods rather than instance methods when demonstrating something that doesn't require instantiating a new object.

Expand Down
74 changes: 0 additions & 74 deletions azure-pipelines.yml

This file was deleted.

2 changes: 1 addition & 1 deletion core/extensions/COMServerDemo/README.md
@@ -1,6 +1,6 @@
# COM Server Demo

This is a basic example of providing a managed COM server in .NET Core 3.1. Documentation on the inner workings of activation can be found [here](https://github.com/dotnet/core-setup/blob/master/Documentation/design-docs/COM-activation.md).
This is a basic example of providing a managed COM server in .NET Core 3.1. Documentation on the inner workings of activation can be found [here](https://github.com/dotnet/core-setup/blob/main/Documentation/design-docs/COM-activation.md).

## Key Features

Expand Down
2 changes: 1 addition & 1 deletion core/extensions/VisioDemo/README.md
Expand Up @@ -2,7 +2,7 @@

This is a basic Visio demo sample in .NET Core. It is designed to work with .NET Core 3.1. It is based on the Excel Demo sample found here:

- [https://github.com/dotnet/samples/tree/master/core/extensions/ExcelDemo](https://github.com/dotnet/samples/tree/master/core/extensions/ExcelDemo)
- [https://github.com/dotnet/samples/tree/main/core/extensions/ExcelDemo](https://github.com/dotnet/samples/tree/main/core/extensions/ExcelDemo)

## Key Features

Expand Down
2 changes: 1 addition & 1 deletion core/hosting/HostWithCoreClrHost/README.md
@@ -1,7 +1,7 @@
.NET Core Hosting Sample
========================

This sample demonstrates a simple .NET Core host using the hosting APIs from [`coreclrhost.h`](https://github.com/dotnet/coreclr/blob/master/src/coreclr/hosts/inc/coreclrhost.h). The sample host loads and starts the .NET runtime, loads managed code, calls into a managed method, and provides a function pointer for the managed code to call back into the host.
This sample demonstrates a simple .NET Core host using the hosting APIs from [`coreclrhost.h`](https://github.com/dotnet/coreclr/blob/main/src/coreclr/hosts/inc/coreclrhost.h). The sample host loads and starts the .NET runtime, loads managed code, calls into a managed method, and provides a function pointer for the managed code to call back into the host.

This sample is part of the [.NET Core hosting tutorial](https://docs.microsoft.com/dotnet/core/tutorials/netcore-hosting). See that topic for a more detailed explanation of this sample.

Expand Down
2 changes: 1 addition & 1 deletion core/hosting/HostWithCoreClrHost/src/coreclrhost.h
@@ -1,4 +1,4 @@
// Retrieved from https://github.com/dotnet/runtime/blob/master/src/coreclr/src/hosts/inc/coreclrhost.h
// Retrieved from https://github.com/dotnet/runtime/blob/main/src/coreclr/src/hosts/inc/coreclrhost.h

// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
Expand Down
4 changes: 2 additions & 2 deletions core/hosting/HostWithHostFxr/readme.md
@@ -1,6 +1,6 @@
# .NET Core Hosting Sample

This project demonstrates a way for a native process to host .NET Core using the `nethost` and `hostfxr` libraries. Documentation on the `nethost` and `hostfxr` APIs can be found [here](https://github.com/dotnet/runtime/blob/master/docs/design/features/native-hosting.md).
This project demonstrates a way for a native process to host .NET Core using the `nethost` and `hostfxr` libraries. Documentation on the `nethost` and `hostfxr` APIs can be found [here](https://github.com/dotnet/runtime/blob/main/docs/design/features/native-hosting.md).

## Key Features

Expand All @@ -9,7 +9,7 @@ Demonstrates how to locate and initialize .NET Core 3.0 from a non-.NET Core pro
The `nethost` header and library are part of the `Microsoft.NETCore.DotNetAppHost` package and are also installed as a runtime pack by the .NET Core SDK. The library should be deployed alongside the host. This sample uses the files installed with the .NET Core SDK.
*Note: The `Microsoft.NETCore.DotNetAppHost` package is a [metapackage](https://docs.microsoft.com/dotnet/core/packages#metapackages) that doesn't actually contain the files. It only references RID-specific packages that contain the files. For example, the package with the actual files for `linux-x64` is `runtime.linux-x64.Microsoft.NETCore.DotNetAppHost`.*

The `coreclr_delegates.h` and `hostfxr.h` files are copied from the [dotnet/runtime](https://github.com/dotnet/runtime) repo - [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/coreclr_delegates.h) and [hostfxr.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h).
The `coreclr_delegates.h` and `hostfxr.h` files are copied from the [dotnet/runtime](https://github.com/dotnet/runtime) repo - [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/main/src/installer/corehost/cli/coreclr_delegates.h) and [hostfxr.h](https://github.com/dotnet/runtime/blob/main/src/installer/corehost/cli/hostfxr.h).

Additional comments are contained in source and project files.

Expand Down
2 changes: 1 addition & 1 deletion core/hosting/README.md
Expand Up @@ -7,6 +7,6 @@ There are two samples demonstrating two different hosting interfaces for .NET Co
1. The [HostWithHostFxr](HostWithHostFxr) folder demonstrates how to host the .NET Core runtime using the `nethost` and `hostfxr` libraries' APIs. These APIs were introduced in .NET Core 3.0 and are the recommended method of hosting .NET Core 3.0 and above. These entry points handle the complexity of finding and setting up the runtime for initialization. This host demonstrates calling from native code into a static managed method and passing it a message to display.
1. The [HostWithCoreClrHost](HostWithCoreClrHost) folder demonstrates how to host the .NET Core runtime using the newer `coreclrhost.h` API. This API is the preferred method of hosting .NET Core 2.2 and below. This host demonstrates calling from native code into a static managed method and supplying a function pointer for the managed code to use to call back into the host.

These hosts are small and bypass a lot of complexity (probing for assemblies in multiple locations, thorough error checking, etc.) that a real host would have. Hopefully by remaining simple, though, they will be useful for demonstrating the core concepts of hosting managed .NET Core code in a native process. Other (more real-world) hosts which may be useful as a guide can be found in .NET Core product source in the [dotnet/runtime](https://github.com/dotnet/runtime/tree/master/src/coreclr/src/hosts) repository.
These hosts are small and bypass a lot of complexity (probing for assemblies in multiple locations, thorough error checking, etc.) that a real host would have. Hopefully by remaining simple, though, they will be useful for demonstrating the core concepts of hosting managed .NET Core code in a native process. Other (more real-world) hosts which may be useful as a guide can be found in .NET Core product source in the [dotnet/runtime](https://github.com/dotnet/runtime/tree/main/src/coreclr/src/hosts) repository.

These samples are part of the [.NET Core hosting tutorial](https://docs.microsoft.com/dotnet/core/tutorials/netcore-hosting). Please see that topic for a more detailed explanation of the samples and the steps necessary to host .NET Core.
2 changes: 1 addition & 1 deletion core/mono-samples/Android/README.md
Expand Up @@ -20,7 +20,7 @@ When running an activity in a non-UI thread, `FindClass` in `native-lib.c` will

## Sample Prerequisites

- ANDROID_NDK & ANDROID_SDK (<https://github.com/dotnet/runtime/blob/master/docs/workflow/testing/libraries/testing-android.md> right under `Testing Libraries on Android`).
- ANDROID_NDK & ANDROID_SDK (<https://github.com/dotnet/runtime/blob/main/docs/workflow/testing/libraries/testing-android.md> right under `Testing Libraries on Android`).
- Android simulator API 21 or greater.
- Dotnet sdk 6.0.100-alpha.1.20628.2.

Expand Down
2 changes: 1 addition & 1 deletion core/mono-samples/wasm/README.md
Expand Up @@ -22,7 +22,7 @@ This sample will only run on macOS.

- Working browser
- .NET sdk 6.0.100-alpha.1.20628.2.
- dotnet-serve (<https://github.com/natemcmaster/dotnet-serve>)
- dotnet-serve (<https://github.com/natemcmain/dotnet-serve>)

To install a specific version of the dotnet sdk, download the latest stable version of the dotnet-install script:

Expand Down
2 changes: 1 addition & 1 deletion core/profiling/eventpipe/README.md
Expand Up @@ -12,7 +12,7 @@ To write EventPipe events, you first create a provider, then define events on th

## Reading events

When EventPipe events are written, they are emitted according to the [file format specification](https://github.com/microsoft/perfview/blob/master/src/TraceEvent/EventPipe/EventPipeFormat.md). The spec is designed to be efficient for both streaming and writing to a file for processing at a later date.
When EventPipe events are written, they are emitted according to the [file format specification](https://github.com/microsoft/perfview/blob/main/src/TraceEvent/EventPipe/EventPipeFormat.md). The spec is designed to be efficient for both streaming and writing to a file for processing at a later date.

The EventPipe reading APIs allow you to create an in-process streaming session to receive events. You create a session by passing in the providers that you wish to receive events from, along with the keywords and level for each provider. Providers are identified by name.

Expand Down
Expand Up @@ -27,7 +27,7 @@ public sealed override ImmutableArray<string> FixableDiagnosticIds

public sealed override FixAllProvider GetFixAllProvider()
{
// See https://github.com/dotnet/roslyn/blob/master/docs/analyzers/FixAllProvider.md for more information on Fix All Providers
// See https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md for more information on Fix All Providers
return WellKnownFixAllProviders.BatchFixer;
}

Expand Down
Expand Up @@ -16,7 +16,7 @@ public class MakeConstAnalyzer : DiagnosticAnalyzer
public const string DiagnosticId = "MakeConst";

// You can change these strings in the Resources.resx file. If you do not want your analyzer to be localize-able, you can use regular strings for Title and MessageFormat.
// See https://github.com/dotnet/roslyn/blob/master/docs/analyzers/Localizing%20Analyzers.md for more on localization
// See https://github.com/dotnet/roslyn/blob/main/docs/analyzers/Localizing%20Analyzers.md for more on localization
private static readonly LocalizableString Title = new LocalizableResourceString(nameof(Resources.AnalyzerTitle), Resources.ResourceManager, typeof(Resources));
private static readonly LocalizableString MessageFormat = new LocalizableResourceString(nameof(Resources.AnalyzerMessageFormat), Resources.ResourceManager, typeof(Resources));
private static readonly LocalizableString Description = new LocalizableResourceString(nameof(Resources.AnalyzerDescription), Resources.ResourceManager, typeof(Resources));
Expand All @@ -28,7 +28,7 @@ public class MakeConstAnalyzer : DiagnosticAnalyzer

public override void Initialize(AnalysisContext context)
{
// See https://github.com/dotnet/roslyn/blob/master/docs/analyzers/Analyzer%20Actions%20Semantics.md for more information
// See https://github.com/dotnet/roslyn/blob/main/docs/analyzers/Analyzer%20Actions%20Semantics.md for more information
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
context.EnableConcurrentExecution();
context.RegisterSyntaxNodeAction(AnalyzeNode, SyntaxKind.LocalDeclarationStatement);
Expand Down

0 comments on commit 67d34f2

Please sign in to comment.