From e295c4dd114c30b86a23da8a82aa7fceb4148afa Mon Sep 17 00:00:00 2001 From: William Xie Date: Fri, 20 Dec 2024 13:49:47 -0800 Subject: [PATCH 1/4] Fix main branch status badge --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 503d305f..37f4e3f9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CLR Instrumentation Engine -Main Branch: [![Build Status](https://dev.azure.com/ms/CLRInstrumentationEngine/_apis/build/status/CI-Yaml?branchName=main)](https://dev.azure.com/ms/CLRInstrumentationEngine/_build/latest?definitionId=275&branchName=main) +Main Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status%2FClrInstrumentationEngine%2FClrInstrumentationEngine-CI-Yaml?repoName=microsoft%2FCLRInstrumentationEngine&branchName=main)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11310&repoName=microsoft%2FCLRInstrumentationEngine&branchName=main) Release Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/GitHub/ClrInstrumentationEngine-Signed-Yaml?branchName=release)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11311&branchName=release) @@ -16,10 +16,10 @@ For more information about our current and future project scope and to track our The CLR Instrumentation Engine is a profiler implementation and is enabled and configured via environment variables for the running process. -* [Getting Started](docs/getting_started.md) for details on how use the CLR Instrumentation Engine. -* [Environment Variables](docs/environment_variables.md) -* [Configure Instrumentation Methods](docs/configuration.md) -* [CLRIE Releases](docs/releases.md) +- [Getting Started](docs/getting_started.md) for details on how use the CLR Instrumentation Engine. +- [Environment Variables](docs/environment_variables.md) +- [Configure Instrumentation Methods](docs/configuration.md) +- [CLRIE Releases](docs/releases.md) ## Contributing @@ -27,19 +27,19 @@ Please read [Contributing](CONTRIBUTING.md) for details on the Contributor Licen This repo builds using Visual Studio 2022 and requires the following components: -|Component Id|Component Friendly Name| -|:--|:-- -Microsoft.Component.MSBuild|MSBuild -Microsoft.VisualStudio.Workload.NativeDesktop|Desktop development with C++ (Workload) -Microsoft.VisualStudio.Component.VC.ATL.Spectre|C++ ATL for latest v143 build tools with Spectre Mitigations (x86 & x64) -Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre|MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest) +| Component Id | Component Friendly Name | +| :----------------------------------------------------------- | :----------------------------------------------------------------------- | +| Microsoft.Component.MSBuild | MSBuild | +| Microsoft.VisualStudio.Workload.NativeDesktop | Desktop development with C++ (Workload) | +| Microsoft.VisualStudio.Component.VC.ATL.Spectre | C++ ATL for latest v143 build tools with Spectre Mitigations (x86 & x64) | +| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest) | Optionally, in order to develop Wixproj files in Visual Studio, you will need to install the [Wix Toolset Visual 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension), also known as the "Votive" extension. -* [Design Notes](DESIGN-NOTES.md) - the overall design for CLR Instrumentation Engine. -* [Build](docs/build.md) - how to run local builds. -* [Test](docs/test.md) - how to run tests. -* [Release Process](docs/release_process.md) - how to release CLRIE to various platforms. +- [Design Notes](DESIGN-NOTES.md) - the overall design for CLR Instrumentation Engine. +- [Build](docs/build.md) - how to run local builds. +- [Test](docs/test.md) - how to run tests. +- [Release Process](docs/release_process.md) - how to release CLRIE to various platforms. ## Versioning From 623807e9dcb927be2c410a8a1be04c235c76a69f Mon Sep 17 00:00:00 2001 From: William Xie Date: Fri, 20 Dec 2024 14:13:19 -0800 Subject: [PATCH 2/4] adjustments --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37f4e3f9..e8c32c49 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CLR Instrumentation Engine -Main Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status%2FClrInstrumentationEngine%2FClrInstrumentationEngine-CI-Yaml?repoName=microsoft%2FCLRInstrumentationEngine&branchName=main)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11310&repoName=microsoft%2FCLRInstrumentationEngine&branchName=main) +Main Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/ClrInstrumentationEngine-CI-Yaml?&branchName=main)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11310&branchName=main) Release Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/GitHub/ClrInstrumentationEngine-Signed-Yaml?branchName=release)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11311&branchName=release) From 3d7f45b0132526a9e0982634c6c4e50d0cb94129 Mon Sep 17 00:00:00 2001 From: William Xie Date: Fri, 20 Dec 2024 14:16:43 -0800 Subject: [PATCH 3/4] nit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8c32c49..106a508d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CLR Instrumentation Engine -Main Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/ClrInstrumentationEngine-CI-Yaml?&branchName=main)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11310&branchName=main) +Main Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/ClrInstrumentationEngine-CI-Yaml?branchName=main)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11310&branchName=main) Release Branch: [![Build Status](https://devdiv.visualstudio.com/DevDiv/_apis/build/status/ClrInstrumentationEngine/GitHub/ClrInstrumentationEngine-Signed-Yaml?branchName=release)](https://devdiv.visualstudio.com/DevDiv/_build/latest?definitionId=11311&branchName=release) From 097eb64108cce0af37ea87d59b8f341b5c53c79c Mon Sep 17 00:00:00 2001 From: William Xie Date: Fri, 20 Dec 2024 14:09:39 -0800 Subject: [PATCH 4/4] disable macos build for now --- .github/workflows/{build.yml => build.yml.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build.yml => build.yml.disabled} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml.disabled similarity index 100% rename from .github/workflows/build.yml rename to .github/workflows/build.yml.disabled