From 280ae4b9ac855e764f9614d8fac705a6906838c5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 04:41:19 +0000 Subject: [PATCH 01/10] Initial plan From 68327c0ea5b542244b131dc9de5aea3562625da3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 04:44:32 +0000 Subject: [PATCH 02/10] Update CI from Windows Server 2019 to Windows latest Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/workflows/build-common.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 6ce2a54d66b..08991521e06 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -80,7 +80,7 @@ jobs: assemble: # running (and uploading artifact) from windows since only that build includes etw - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Support long paths run: git config --system core.longpaths true @@ -131,13 +131,13 @@ jobs: # TODO (trask) enable once profiler supports OpenJ9 # - openj9 os: - - windows-2019 + - windows-latest - ubuntu-latest fail-fast: false steps: - name: Support long paths run: git config --system core.longpaths true - if: matrix.os == 'windows-2019' + if: matrix.os == 'windows-latest' - uses: actions/checkout@v4 From 6bf53cb946ebee190c5d3bb4655e99aa79be0706 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 05:26:15 +0000 Subject: [PATCH 03/10] Fix Windows ETW native build by updating Visual Studio path for windows-latest Co-authored-by: trask <218610+trask@users.noreply.github.com> --- etw/README.md | 2 +- etw/native/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etw/README.md b/etw/README.md index 1e273388204..cabdd0a3825 100644 --- a/etw/README.md +++ b/etw/README.md @@ -18,7 +18,7 @@ The build should find the tools and Windows SDK, but if needed these environment * Default: `"%ProgramFiles(x86)%/Windows Kits/10"` * `APPINSIGHTS_VS_PATH` * Location of Visual Studio Build Tools - * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio 14.0` + * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio/2022/BuildTools` * `APPINSIGHTS_WIN_SDK_LIB_PATH` * Location of Windows 10 SDK library folder (for linker requirements) * Default: `%APPINSIGHTS_WIN10_SDK_PATH%/Lib/10.0.18362.0/um` diff --git a/etw/native/build.gradle b/etw/native/build.gradle index d8815058213..3882158b3ad 100644 --- a/etw/native/build.gradle +++ b/etw/native/build.gradle @@ -13,7 +13,7 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) { winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH" } -def vsToolsDir = "$programFilesX86/Microsoft Visual Studio 14.0" +def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/BuildTools" if (System.env.APPINSIGHTS_VS_PATH) { vsToolsDir = System.env.APPINSIGHTS_VS_PATH logger.info "Visual Studio Build Tools path set with environment variable, APPINSIGHTS_VS_PATH" From 7d2d71acac1903a361653ca8f87835fe6e0ad48e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 3 Jul 2025 14:54:25 +0000 Subject: [PATCH 04/10] Fix Visual Studio path detection for windows-latest CI runners Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/workflows/build-common.yml | 3 +++ etw/README.md | 2 +- etw/native/build.gradle | 24 +++++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 08991521e06..50f5df2e1a5 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -103,6 +103,9 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + - name: Assemble # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/ run: > diff --git a/etw/README.md b/etw/README.md index cabdd0a3825..5ffc8d7de0c 100644 --- a/etw/README.md +++ b/etw/README.md @@ -18,7 +18,7 @@ The build should find the tools and Windows SDK, but if needed these environment * Default: `"%ProgramFiles(x86)%/Windows Kits/10"` * `APPINSIGHTS_VS_PATH` * Location of Visual Studio Build Tools - * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio/2022/BuildTools` + * Default: `%ProgramFiles(x86)%/Microsoft Visual Studio/2022/Enterprise` * `APPINSIGHTS_WIN_SDK_LIB_PATH` * Location of Windows 10 SDK library folder (for linker requirements) * Default: `%APPINSIGHTS_WIN10_SDK_PATH%/Lib/10.0.18362.0/um` diff --git a/etw/native/build.gradle b/etw/native/build.gradle index 3882158b3ad..b26e00fe48b 100644 --- a/etw/native/build.gradle +++ b/etw/native/build.gradle @@ -13,7 +13,29 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) { winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH" } -def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/BuildTools" +// Find Visual Studio installation +def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/Enterprise" + +// Check for alternative locations on GitHub Actions +if (!new File(vsToolsDir).exists()) { + def alternativePaths = [ + "C:/Program Files/Microsoft Visual Studio/2022/Enterprise", + "$programFilesX86/Microsoft Visual Studio/2022/Professional", + "C:/Program Files/Microsoft Visual Studio/2022/Professional", + "$programFilesX86/Microsoft Visual Studio/2022/Community", + "C:/Program Files/Microsoft Visual Studio/2022/Community", + "$programFilesX86/Microsoft Visual Studio/2022/BuildTools", + "C:/Program Files/Microsoft Visual Studio/2022/BuildTools" + ] + + for (def path : alternativePaths) { + if (new File(path).exists()) { + vsToolsDir = path + break + } + } +} + if (System.env.APPINSIGHTS_VS_PATH) { vsToolsDir = System.env.APPINSIGHTS_VS_PATH logger.info "Visual Studio Build Tools path set with environment variable, APPINSIGHTS_VS_PATH" From cbb870359d564bfe858e7dee938c7b01f724e76d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 4 Jul 2025 18:39:15 +0000 Subject: [PATCH 05/10] Pin Windows runners to windows-2022 (oldest supported version) Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/workflows/build-common.yml | 6 +++--- .github/workflows/codeql-daily.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 50f5df2e1a5..ec6606541f0 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -80,7 +80,7 @@ jobs: assemble: # running (and uploading artifact) from windows since only that build includes etw - runs-on: windows-latest + runs-on: windows-2022 steps: - name: Support long paths run: git config --system core.longpaths true @@ -134,13 +134,13 @@ jobs: # TODO (trask) enable once profiler supports OpenJ9 # - openj9 os: - - windows-latest + - windows-2022 - ubuntu-latest fail-fast: false steps: - name: Support long paths run: git config --system core.longpaths true - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' - uses: actions/checkout@v4 diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index f94fe15b5aa..4e1307beb6b 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -49,7 +49,7 @@ jobs: permissions: actions: read security-events: write - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v4 From 6d8af0f1ada4d6c502923c398099c840ddb9b17a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 4 Jul 2025 18:44:45 +0000 Subject: [PATCH 06/10] Simplify Visual Studio path detection to use standard GitHub Actions path Co-authored-by: trask <218610+trask@users.noreply.github.com> --- etw/native/build.gradle | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/etw/native/build.gradle b/etw/native/build.gradle index b26e00fe48b..16fa01a9802 100644 --- a/etw/native/build.gradle +++ b/etw/native/build.gradle @@ -13,28 +13,8 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) { winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH" } -// Find Visual Studio installation -def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/Enterprise" - -// Check for alternative locations on GitHub Actions -if (!new File(vsToolsDir).exists()) { - def alternativePaths = [ - "C:/Program Files/Microsoft Visual Studio/2022/Enterprise", - "$programFilesX86/Microsoft Visual Studio/2022/Professional", - "C:/Program Files/Microsoft Visual Studio/2022/Professional", - "$programFilesX86/Microsoft Visual Studio/2022/Community", - "C:/Program Files/Microsoft Visual Studio/2022/Community", - "$programFilesX86/Microsoft Visual Studio/2022/BuildTools", - "C:/Program Files/Microsoft Visual Studio/2022/BuildTools" - ] - - for (def path : alternativePaths) { - if (new File(path).exists()) { - vsToolsDir = path - break - } - } -} +// Visual Studio 2022 Build Tools path for GitHub Actions windows-2022 runners +def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/BuildTools" if (System.env.APPINSIGHTS_VS_PATH) { vsToolsDir = System.env.APPINSIGHTS_VS_PATH From 0c14332524640895105c801d0286ab4a4af1e60e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 4 Jul 2025 19:13:37 +0000 Subject: [PATCH 07/10] Fix Windows CI build by adding proper Visual Studio and Windows SDK setup Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/workflows/build-common.yml | 13 +++++++++++++ etw/native/build.gradle | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index ec6606541f0..8d690959f4b 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -106,6 +106,19 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 + - name: Setup Windows 10 SDK + uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 + with: + sdk-version: 22621 + + - name: Setup Visual Studio environment + shell: cmd + run: | + "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath > vs.txt + set /p VSPATH=>%GITHUB_ENV% + echo APPINSIGHTS_WIN10_SDK_PATH=C:\Program Files (x86)\Windows Kits\10>>%GITHUB_ENV% + - name: Assemble # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/ run: > diff --git a/etw/native/build.gradle b/etw/native/build.gradle index 16fa01a9802..aa02ae5c16c 100644 --- a/etw/native/build.gradle +++ b/etw/native/build.gradle @@ -13,12 +13,12 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) { winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH" } -// Visual Studio 2022 Build Tools path for GitHub Actions windows-2022 runners -def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/BuildTools" - +// Visual Studio Build Tools path - use environment variable if available, fallback to standard path +def vsToolsDir = System.env.APPINSIGHTS_VS_PATH ?: "$programFilesX86/Microsoft Visual Studio/2022/BuildTools" if (System.env.APPINSIGHTS_VS_PATH) { - vsToolsDir = System.env.APPINSIGHTS_VS_PATH - logger.info "Visual Studio Build Tools path set with environment variable, APPINSIGHTS_VS_PATH" + logger.info "Visual Studio Build Tools path set with environment variable: $vsToolsDir" +} else { + logger.info "Using default Visual Studio Build Tools path: $vsToolsDir" } logger.info "Windows SDK: $winSdkDir" From 3f642b3d1d750e5555d685f942630c2a5e384e3b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 4 Jul 2025 19:28:06 +0000 Subject: [PATCH 08/10] Remove 3rd party Windows SDK action and use built-in tools Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/workflows/build-common.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 8d690959f4b..06de7ee4a91 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -106,12 +106,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v2 - - name: Setup Windows 10 SDK - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 - with: - sdk-version: 22621 - - - name: Setup Visual Studio environment + - name: Setup Visual Studio and Windows SDK environment shell: cmd run: | "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath > vs.txt From c7266263dacc3797f9359a37c56a478303474bb7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 7 Jul 2025 07:21:49 -0700 Subject: [PATCH 09/10] empty commit to reset the last changed by copilot status From 1b352bb940d6882a635ee8a31e17ae7da3b66d92 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 7 Jul 2025 07:25:57 -0700 Subject: [PATCH 10/10] another commit to reset the last changed by copilot status --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89ab624a944..5b8614b0b33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # CHANGELOG + ## Version 3.7.3 GA (05/28/2025) ### Enhancements