diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index 730efedf620d..cb521dc97a9a 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -116,6 +116,7 @@ stages: # The sign settings have been configured to - script: ./eng/build.cmd -ci + -nativeToolsOnMachine -arch x64 -pack -all @@ -588,11 +589,11 @@ stages: timeoutInMinutes: 240 steps: # Build the shared framework - - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64 + - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -pack -arch x64 /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs) displayName: Build shared fx # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step. - - script: ./eng/build.cmd -ci -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test + - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs) displayName: Run build.cmd helix target @@ -611,7 +612,7 @@ stages: parameters: platform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true jobProperties: diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 886ccb870b45..61d5c7a3657a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -187,6 +187,7 @@ extends: # The sign settings have been configured to - script: ./eng/build.cmd -ci + -nativeToolsOnMachine -arch x64 -pack -all @@ -657,11 +658,11 @@ extends: timeoutInMinutes: 240 steps: # Build the shared framework - - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64 + - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -pack -arch x64 /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs) displayName: Build shared fx # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step. - - script: ./eng/build.cmd -ci -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test + - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs) displayName: Run build.cmd helix target @@ -681,7 +682,7 @@ extends: enableInternalSources: true platform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true jobProperties: diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml index 33b1a3c483fa..7318a774b918 100644 --- a/.azure/pipelines/helix-matrix.yml +++ b/.azure/pipelines/helix-matrix.yml @@ -31,7 +31,7 @@ jobs: timeoutInMinutes: 300 steps: # Build the shared framework - - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64 + - script: ./eng/build.cmd -ci -nativeToolsOnMachine -nobl -all -pack -arch x64 /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log displayName: Build shared fx # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step. diff --git a/.azure/pipelines/jobs/codesign-xplat.yml b/.azure/pipelines/jobs/codesign-xplat.yml index 2be4f5b8fc77..5b585d4a62fe 100644 --- a/.azure/pipelines/jobs/codesign-xplat.yml +++ b/.azure/pipelines/jobs/codesign-xplat.yml @@ -13,7 +13,6 @@ jobs: jobDisplayName: "Code-sign ${{ parameters.inputName }} packages" agentOs: Windows installNodeJs: false - installJdk: false steps: - task: DownloadPipelineArtifact@2 displayName: Download ${{ parameters.inputName }} artifacts diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index f45f395d6ae3..fbe60b3e7964 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -68,7 +68,6 @@ parameters: container: '' enableRichCodeNavigation: '' installNodeJs: true - installJdk: true # Ignored unless agentOs == Windows. timeoutInMinutes: 180 testRunTitle: $(AgentOsName)-$(BuildConfiguration) useHostedUbuntu: true @@ -107,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-12 + vmImage: macOS-13 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -116,7 +115,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals 1es-windows-2022-open + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} ${{ if ne(parameters.disableComponentGovernance, '') }}: @@ -131,8 +130,6 @@ jobs: - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory) - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - TeamName: AspNetCore - - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if ne(parameters.codeSign, true) }}: - _SignType: '' - LC_ALL: 'en_US.UTF-8' @@ -167,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer - displayName: Use XCode 14.2.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -181,14 +178,11 @@ jobs: displayName: Install Node 18.x inputs: versionSpec: 18.x - - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - - powershell: ./eng/scripts/InstallJdk.ps1 - displayName: Install JDK 11 - - ${{ if eq(parameters.isAzDOTestingJob, true) }}: - - powershell: | - Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\" - ./eng/scripts/InstallGoogleChrome.ps1 - displayName: Install Chrome + - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: + - powershell: | + Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\" + ./eng/scripts/InstallGoogleChrome.ps1 + displayName: Install Chrome - ${{ if eq(parameters.agentOs, 'Windows') }}: - powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools" displayName: Add dotnet tools to path @@ -215,7 +209,7 @@ jobs: ${{ step.env }} - ${{ if eq(parameters.steps, '')}}: - ${{ if eq(parameters.agentOs, 'Windows') }}: - - script: $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) + - script: $(BuildDirectory)\build.cmd -ci -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType) displayName: Run build.cmd env: @@ -326,7 +320,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-12 + image: macOS-13 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) @@ -335,7 +329,7 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngInternalBuildPool) # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - image: 1es-windows-2022 + image: windows.vs2022preview.amd64 os: windows ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} @@ -351,8 +345,6 @@ jobs: - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory) - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - TeamName: AspNetCore - - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64 - ${{ if eq(parameters.codeSign, true) }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - _SignType: real @@ -390,8 +382,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_14.2.0.app/Contents/Developer - displayName: Use XCode 14.2.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -404,14 +396,11 @@ jobs: displayName: Install Node 18.x inputs: versionSpec: 18.x - - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}: - - powershell: ./eng/scripts/InstallJdk.ps1 - displayName: Install JDK 11 - - ${{ if eq(parameters.isAzDOTestingJob, true) }}: - - powershell: | - Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\" - ./eng/scripts/InstallGoogleChrome.ps1 - displayName: Install Chrome + - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: + - powershell: | + Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\" + ./eng/scripts/InstallGoogleChrome.ps1 + displayName: Install Chrome - ${{ if eq(parameters.agentOs, 'Windows') }}: - powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools" displayName: Add dotnet tools to path @@ -472,7 +461,7 @@ jobs: ${{ step.env }} - ${{ if eq(parameters.steps, '')}}: - ${{ if eq(parameters.agentOs, 'Windows') }}: - - script: $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) + - script: $(BuildDirectory)\build.cmd -ci -nativeToolsOnMachine -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType) displayName: Run build.cmd env: diff --git a/NuGet.config b/NuGet.config index bad334e8c9b3..3990b0eb030f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,17 +6,10 @@ - + - - - - - - - - + @@ -37,17 +30,10 @@ - + - - - - - - - - + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index d0138a65e8de..d3b8339d3795 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -120,138 +120,138 @@ - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - - - + + + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - - + + @@ -259,7 +259,7 @@ - 8.0.10 + 8.0.11 @@ -268,51 +268,51 @@ - 8.0.10 + 8.0.11 - + - + - + - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - - + + @@ -322,8 +322,8 @@ - - + + @@ -331,8 +331,8 @@ - - + + @@ -343,58 +343,58 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 @@ -403,7 +403,7 @@ - 8.0.10 + 8.0.11 @@ -411,71 +411,71 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 - - + + - 8.0.10 + 8.0.11 @@ -491,27 +491,27 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 @@ -520,23 +520,23 @@ - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -545,54 +545,54 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - - + + - - + + - - + + - 8.0.10 + 8.0.11 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - - - - + + + + - 8.0.10 + 8.0.11 @@ -685,64 +685,64 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -764,7 +764,7 @@ - 8.0.10 + 8.0.11 @@ -786,7 +786,7 @@ - 8.0.10 + 8.0.11 @@ -802,23 +802,23 @@ - 8.0.10 + 8.0.11 - + - + - + @@ -826,24 +826,24 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - - - + + + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -853,7 +853,7 @@ - 8.0.10 + 8.0.11 @@ -862,73 +862,73 @@ - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - + - + - + - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -957,11 +957,11 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 @@ -979,18 +979,18 @@ - 8.0.10 + 8.0.11 - 8.0.10 + 8.0.11 - + - 8.0.10 + 8.0.11 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index b69677446aba..5092a4a5ea28 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08f471a66db1..45c80c8f424b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5d020e763f00511c102f94fdf5bf525512d7daaf + 10196376f4843cbbf180ec6ab2ce7d34ceec2fab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,13 +185,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/source-build-externals - d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 + 3b85d089311e89b47758ba6a84eeb79374476dc8 @@ -275,17 +275,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://github.com/dotnet/xdt @@ -344,22 +344,22 @@ - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + 4ff64493649bd045ced204661958393dc5575e96 - + https://github.com/dotnet/roslyn - 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 + 4ff64493649bd045ced204661958393dc5575e96 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -368,34 +368,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index f89dc61bace1..37f913c252cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 - 11 + 12 true @@ -67,12 +67,12 @@ 8.0.2 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11-servicing.24517.7 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12-servicing.24603.5 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 8.0.0 8.0.1 @@ -143,30 +143,30 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 6.2.4 6.2.4 6.2.4 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 - 8.0.0-beta.24516.1 + 8.0.0-beta.24562.12 + 8.0.0-beta.24562.12 + 8.0.0-beta.24562.12 - 8.0.0-alpha.1.24510.2 + 8.0.0-alpha.1.24516.2 8.0.0-alpha.1.24415.1 @@ -249,11 +249,11 @@ 3.3.1 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 - 4.8.0-3.23518.7 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 + 4.8.0-7.24574.2 3.3.3 1.1.2-beta1.23371.1 1.1.2-beta1.23371.1 @@ -299,7 +299,7 @@ 2.57.0 2.57.0 2.57.0 - 2.5.108 + 2.5.187 3.2.0 3.2.0 3.2.0 diff --git a/eng/build.ps1 b/eng/build.ps1 index 9eca32052315..b553b5cb8072 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -12,6 +12,9 @@ build projects, run tests, and generate code. .PARAMETER CI Sets up CI specific settings and variables. +.PARAMETER NativeToolsOnMachine +Turns on native tooling handling. On CI machines, promotes native tools listed in global.json to the path. + .PARAMETER Restore Run restore. @@ -121,6 +124,7 @@ Online version: https://github.com/dotnet/aspnetcore/blob/main/docs/BuildFromSou [CmdletBinding(PositionalBinding = $false, DefaultParameterSetName='Groups')] param( [switch]$CI, + [switch]$NativeToolsOnMachine, # Build lifecycle options [switch]$Restore, @@ -304,58 +308,6 @@ $performDesktopBuild = ($BuildInstallers -and $Architecture -ne "arm") -or ` $performDotnetBuild = $BuildJava -or $BuildManaged -or $BuildNodeJS -or ` ($All -and -not ($NoBuildJava -and $NoBuildManaged -and $NoBuildNodeJS)) -or ` ($Projects -and -not ($BuildInstallers -or $specifiedBuildNative)) -$foundJdk = $false -$javac = Get-Command javac -ErrorAction Ignore -CommandType Application -$localJdkPath = "$PSScriptRoot\..\.tools\jdk\win-x64\" -if (Test-Path "$localJdkPath\bin\javac.exe") { - $foundJdk = $true - Write-Host -f Magenta "Detected JDK in $localJdkPath (via local repo convention)" - $env:JAVA_HOME = $localJdkPath -} -elseif ($env:JAVA_HOME) { - if (-not (Test-Path "${env:JAVA_HOME}\bin\javac.exe")) { - Write-Error "The environment variable JAVA_HOME was set, but ${env:JAVA_HOME}\bin\javac.exe does not exist. Remove JAVA_HOME or update it to the correct location for the JDK. See https://www.bing.com/search?q=java_home for details." - } - else { - Write-Host -f Magenta "Detected JDK in ${env:JAVA_HOME} (via JAVA_HOME)" - $foundJdk = $true - } -} -elseif ($javac) { - $foundJdk = $true - $javaHome = Split-Path -Parent (Split-Path -Parent $javac.Path) - $env:JAVA_HOME = $javaHome - Write-Host -f Magenta "Detected JDK in $javaHome (via PATH)" -} -else { - try { - $jdkRegistryKeys = @( - "HKLM:\SOFTWARE\JavaSoft\JDK", # for JDK 10+ - "HKLM:\SOFTWARE\JavaSoft\Java Development Kit" # fallback for JDK 8 - ) - $jdkRegistryKey = $jdkRegistryKeys | Where-Object { Test-Path $_ } | Select-Object -First 1 - if ($jdkRegistryKey) { - $jdkVersion = (Get-Item $jdkRegistryKey | Get-ItemProperty -name CurrentVersion).CurrentVersion - $javaHome = (Get-Item $jdkRegistryKey\$jdkVersion | Get-ItemProperty -Name JavaHome).JavaHome - if (Test-Path "${javaHome}\bin\javac.exe") { - $env:JAVA_HOME = $javaHome - Write-Host -f Magenta "Detected JDK $jdkVersion in $env:JAVA_HOME (via registry)" - $foundJdk = $true - } - } - } - catch { - Write-Verbose "Failed to detect Java: $_" - } -} - -if ($env:PATH -notlike "*${env:JAVA_HOME}*") { - $env:PATH = "$(Join-Path $env:JAVA_HOME bin);${env:PATH}" -} - -if (-not $foundJdk -and $RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJava) { - Write-Error "Could not find the JDK. Either run $PSScriptRoot\scripts\InstallJdk.ps1 to install for this repo, or install the JDK globally on your machine (see $PSScriptRoot\..\docs\BuildFromSource.md for details)." -} # Initialize global variables need to be set before the import of Arcade is imported $restore = $RunRestore @@ -384,6 +336,61 @@ Remove-Item variable:global:_MSBuildExe -ea Ignore # Import Arcade . "$PSScriptRoot/common/tools.ps1" +function LocateJava { + $foundJdk = $false + $javac = Get-Command javac -ErrorAction Ignore -CommandType Application + $localJdkPath = "$PSScriptRoot\..\.tools\jdk\win-x64\" + if (Test-Path "$localJdkPath\bin\javac.exe") { + $foundJdk = $true + Write-Host -f Magenta "Detected JDK in $localJdkPath (via local repo convention)" + $env:JAVA_HOME = $localJdkPath + } + elseif ($env:JAVA_HOME) { + if (-not (Test-Path "${env:JAVA_HOME}\bin\javac.exe")) { + Write-Error "The environment variable JAVA_HOME was set, but ${env:JAVA_HOME}\bin\javac.exe does not exist. Remove JAVA_HOME or update it to the correct location for the JDK. See https://www.bing.com/search?q=java_home for details." + } + else { + Write-Host -f Magenta "Detected JDK in ${env:JAVA_HOME} (via JAVA_HOME)" + $foundJdk = $true + } + } + elseif ($javac) { + $foundJdk = $true + $javaHome = Split-Path -Parent (Split-Path -Parent $javac.Path) + $env:JAVA_HOME = $javaHome + Write-Host -f Magenta "Detected JDK in $javaHome (via PATH)" + } + else { + try { + $jdkRegistryKeys = @( + "HKLM:\SOFTWARE\JavaSoft\JDK", # for JDK 10+ + "HKLM:\SOFTWARE\JavaSoft\Java Development Kit" # fallback for JDK 8 + ) + $jdkRegistryKey = $jdkRegistryKeys | Where-Object { Test-Path $_ } | Select-Object -First 1 + if ($jdkRegistryKey) { + $jdkVersion = (Get-Item $jdkRegistryKey | Get-ItemProperty -name CurrentVersion).CurrentVersion + $javaHome = (Get-Item $jdkRegistryKey\$jdkVersion | Get-ItemProperty -Name JavaHome).JavaHome + if (Test-Path "${javaHome}\bin\javac.exe") { + $env:JAVA_HOME = $javaHome + Write-Host -f Magenta "Detected JDK $jdkVersion in $env:JAVA_HOME (via registry)" + $foundJdk = $true + } + } + } + catch { + Write-Verbose "Failed to detect Java: $_" + } + } + + if ($env:PATH -notlike "*${env:JAVA_HOME}*") { + $env:PATH = "$(Join-Path $env:JAVA_HOME bin);${env:PATH}" + } + + if (-not $foundJdk -and $RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJava) { + Write-Error "Could not find the JDK. Either run $PSScriptRoot\scripts\InstallJdk.ps1 to install for this repo, or install the JDK globally on your machine (see $PSScriptRoot\..\docs\BuildFromSource.md for details)." + } +} + # Add default .binlog location if not already on the command line. tools.ps1 does not handle this; it just checks # $BinaryLog, $CI and $ExcludeCIBinarylog values for an error case. But tools.ps1 provides a nice function to help. if ($BinaryLog) { @@ -416,6 +423,17 @@ try { $tmpRestore = $restore $restore = $true + # Initialize the native tools before locating java. + if ($NativeToolsOnMachine) { + $env:NativeToolsOnMachine=$true + # Do not promote native tools except in cases where -NativeToolsOnMachine is passed. + # Currently the JDK is laid out in an incorrect pattern: https://github.com/dotnet/dnceng/issues/2185 + InitializeNativeTools + } + + # Locate java, now that we may have java available after initializing native tools. + LocateJava + $toolsetBuildProj = InitializeToolset $restore = $tmpRestore diff --git a/eng/configure-toolset.sh b/eng/configure-toolset.sh index ea92acd6a37b..029466fc2442 100755 --- a/eng/configure-toolset.sh +++ b/eng/configure-toolset.sh @@ -5,3 +5,6 @@ if [ "${DotNetBuildFromSource:-false}" = false ]; then use_installed_dotnet_cli="false" fi + +# Working around issue https://github.com/dotnet/arcade/issues/2673 +DisableNativeToolsetInstalls=true \ No newline at end of file diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1 index 6440cb1c2812..0872f241a982 100644 --- a/eng/scripts/InstallJdk.ps1 +++ b/eng/scripts/InstallJdk.ps1 @@ -23,7 +23,7 @@ $javacExe = "$installDir\bin\javac.exe" $tempDir = "$repoRoot\obj" if (-not $JdkVersion) { $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json - $JdkVersion = $globalJson.tools.jdk + $JdkVersion = $globalJson.'native-tools'.jdk } if (Test-Path $javacExe) { @@ -40,12 +40,13 @@ Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null mkdir $tempDir -ea Ignore | out-null mkdir $installDir -ea Ignore | out-null Write-Host "Starting download of JDK ${JdkVersion}" -& $PSScriptRoot\Download.ps1 "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/jdk-${JdkVersion}_windows-x64_bin.zip" "$tempDir/jdk.zip" +& $PSScriptRoot\Download.ps1 "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/microsoft-jdk-${JdkVersion}-windows-x64.zip" "$tempDir/jdk.zip" Write-Host "Done downloading JDK ${JdkVersion}" Expand-Archive "$tempDir/jdk.zip" -d "$tempDir/jdk/" Write-Host "Expanded JDK to $tempDir" Write-Host "Installing JDK to $installDir" -Move-Item "$tempDir/jdk/jdk-${JdkVersion}/*" $installDir +# The name of the file directory within the zip is based on the version, but may contain a +N for build number. +Move-Item "$(Get-ChildItem -Path "$tempDir/jdk" | Select-Object -First 1)/*" $installDir Write-Host "Done installing JDK to $installDir" if ($env:TF_BUILD) { diff --git a/eng/targets/Java.Common.targets b/eng/targets/Java.Common.targets index c8905b10c4b6..81c643e60c27 100644 --- a/eng/targets/Java.Common.targets +++ b/eng/targets/Java.Common.targets @@ -64,8 +64,8 @@ - - + + diff --git a/global.json b/global.json index cbc2adc9d22b..2362d9d79dae 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.110" + "version": "8.0.111" }, "tools": { - "dotnet": "8.0.110", + "dotnet": "8.0.111", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -12,8 +12,6 @@ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ] }, - "Git": "2.22.0", - "jdk": "11.0.3", "vs": { "version": "17.2", "components": [ @@ -27,7 +25,10 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24562.12" + }, + "native-tools": { + "jdk": "11.0.24" } } diff --git a/src/Components/CustomElements/src/js/yarn.lock b/src/Components/CustomElements/src/js/yarn.lock index e50a034668ef..e16748cab314 100644 --- a/src/Components/CustomElements/src/js/yarn.lock +++ b/src/Components/CustomElements/src/js/yarn.lock @@ -2463,9 +2463,9 @@ semver@^7.3.4, semver@^7.3.7: lru-cache "^6.0.0" serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json index 0536a46be9df..1137c7475778 100644 --- a/src/Components/Web.JS/package.json +++ b/src/Components/Web.JS/package.json @@ -1,5 +1,5 @@ { - "name": "microsoft.aspnetcore.components.web.js", + "name": "@microsoft/microsoft.aspnetcore.components.web.js", "private": true, "version": "0.0.1", "description": "", diff --git a/src/Components/Web.JS/yarn.lock b/src/Components/Web.JS/yarn.lock index ce9623f9fce9..00817ce9d507 100644 --- a/src/Components/Web.JS/yarn.lock +++ b/src/Components/Web.JS/yarn.lock @@ -4028,9 +4028,9 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: lru-cache "^6.0.0" serialize-javascript@^6.0.1: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity "sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==" + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Interop/yarn.lock b/src/Components/WebAssembly/Authentication.Msal/src/Interop/yarn.lock index 4d2ca6b4d616..36b605377f79 100644 --- a/src/Components/WebAssembly/Authentication.Msal/src/Interop/yarn.lock +++ b/src/Components/WebAssembly/Authentication.Msal/src/Interop/yarn.lock @@ -2475,9 +2475,9 @@ semver@^7.3.4, semver@^7.3.7: lru-cache "^6.0.0" serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/yarn.lock b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/yarn.lock index ca9c3f6caebc..8673a94c5d39 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/yarn.lock +++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Interop/yarn.lock @@ -2537,9 +2537,9 @@ serialize-javascript@^4.0.0: randombytes "^2.1.0" serialize-javascript@^6.0.1: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" diff --git a/src/Middleware/Diagnostics/src/_package.json b/src/Middleware/Diagnostics/src/_package.json index a89dd3241cf6..7262c61e559d 100644 --- a/src/Middleware/Diagnostics/src/_package.json +++ b/src/Middleware/Diagnostics/src/_package.json @@ -1,5 +1,5 @@ { - "name": "DiagnosticsPages", + "name": "@microsoft/DiagnosticsPages", "version": "0.0.0", "description": "", "private": true, diff --git a/src/Mvc/Mvc.TagHelpers/src/_package.json b/src/Mvc/Mvc.TagHelpers/src/_package.json index ea557bf64ef8..46d78f15d9c1 100644 --- a/src/Mvc/Mvc.TagHelpers/src/_package.json +++ b/src/Mvc/Mvc.TagHelpers/src/_package.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "name": "Microsoft.AspNetCore.Mvc.TagHelpers", + "name": "@microsoft/Microsoft.AspNetCore.Mvc.TagHelpers", "private": true, "devDependencies": { "grunt": "~0.4.5", diff --git a/src/Mvc/test/WebSites/BasicWebSite/_package.json b/src/Mvc/test/WebSites/BasicWebSite/_package.json index a0d2a37b7acb..f06282ec0ede 100644 --- a/src/Mvc/test/WebSites/BasicWebSite/_package.json +++ b/src/Mvc/test/WebSites/BasicWebSite/_package.json @@ -1,6 +1,6 @@ { "version": "0.0.0", - "name": "BasicWebSite", + "name": "@microsoft/BasicWebSite", "description": "Web site demonstrating various validations.", "private": true, "devDependencies": { diff --git a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json index 45df438fd2a0..e927a42c5226 100644 --- a/src/Mvc/test/WebSites/GenericHostWebSite/_package.json +++ b/src/Mvc/test/WebSites/GenericHostWebSite/_package.json @@ -1,6 +1,6 @@ { "version": "0.0.0", - "name": "GenericHostWebSite", + "name": "@microsoft/GenericHostWebSite", "description": "Web site demonstrating various validations.", "private": true, "devDependencies": { diff --git a/src/ProjectTemplates/test/Templates.Tests/package.json b/src/ProjectTemplates/test/Templates.Tests/package.json index cf27e5755093..88881e57546b 100644 --- a/src/ProjectTemplates/test/Templates.Tests/package.json +++ b/src/ProjectTemplates/test/Templates.Tests/package.json @@ -1,5 +1,5 @@ { - "name": "microsoft.aspnetcore.projecttemplates.tests", + "name": "@microsoft/microsoft.aspnetcore.projecttemplates.tests", "version": "0.0.1", "description": "Not a real package. This file exists only to declare dependencies.", "main": "index.js", diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 7314185e2fa4..895f8c4338d3 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -6,13 +6,12 @@ buildscript { } dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:6.6.1" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0' } } plugins { id 'java' - id 'maven' + id 'maven-publish' } allprojects { @@ -22,7 +21,9 @@ allprojects { // If we're run from outside MSBuild, just assign a bogus dev version. version project.findProperty('packageVersion') ?: "99.99.99-dev" - sourceCompatibility = 1.8 + java { + sourceCompatibility = 1.8 + } repositories { mavenCentral() @@ -52,4 +53,4 @@ spotless { indentWithSpaces(4) removeUnusedImports() // removes any unused imports } -} \ No newline at end of file +} diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index e25ea21dbc9c..4f8386c44ed0 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -1,10 +1,15 @@ plugins { id 'java' - id 'maven' + id 'maven-publish' } group 'com.microsoft.signalr' +java { + withJavadocJar() + withSourcesJar() +} + dependencies { implementation 'com.google.code.gson:gson:2.8.9' implementation 'com.squareup.okhttp3:okhttp:4.10.0' @@ -12,49 +17,51 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.25' } -archivesBaseName = 'signalr' - -task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava +base { + archivesName = 'signalr' } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" - from javadoc.destinationDir -} +publishing { + publications { + release(MavenPublication) { + from components.java -task generatePOM { - pom { - project { artifactId 'signalr' - inceptionYear '2018' - description 'ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'MIT License' - url 'https://opensource.org/licenses/MIT' - distribution 'repo' + + pom { + packaging = 'jar' + inceptionYear = '2018' + url = 'https://github.com/dotnet/aspnetcore' + name = groupId + ':' + artifactId + description = 'ASP.NET Core SignalR Client for Java applications' + licenses { + license { + name = 'MIT License' + url = 'https://opensource.org/licenses/MIT' + distribution = 'repo' + } } - } - scm { - connection 'scm:git:https://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' - url 'https://github.com/dotnet/aspnetcore/tree/main' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' + scm { + connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + url = 'https://github.com/dotnet/aspnetcore/tree/main' + } + developers { + developer { + id = 'microsoft' + name = 'Microsoft' + } } } } - }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") + } } -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) +tasks.withType(GenerateMavenPom).all { + def matcher = name =~ /generatePomFileFor(\w+)Publication/ + def publicationName = matcher[0][1] + destination = layout.buildDirectory.file("libs/signalr-${project.version}.pom").get().asFile +} task generateVersionClass { inputs.property "version", project.version diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java index 767f306cd9b6..3ef3a6968843 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java @@ -116,9 +116,9 @@ public Single send(HttpRequest httpRequest, ByteBuffer bodyContent case "POST": RequestBody body; if (bodyContent != null) { - body = RequestBody.create(MediaType.parse("text/plain"), ByteString.of(bodyContent)); + body = RequestBody.Companion.create(ByteString.of(bodyContent), MediaType.parse("text/plain")); } else { - body = RequestBody.create(null, new byte[]{}); + body = RequestBody.Companion.create(new byte[]{}, null); } requestBuilder.post(body); diff --git a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties index 3eb10089fafd..df5ca3a8b779 100644 --- a/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties +++ b/src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 4787c62e3aae..69e0802b51a9 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -1,56 +1,64 @@ plugins { id 'java' - id 'maven' + id 'maven-publish' } group 'com.microsoft.signalr.messagepack' +java +{ + withJavadocJar() + withSourcesJar() +} + dependencies { implementation project(':core') - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' + implementation 'org.msgpack:msgpack-core:0.8.20' + implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20' } -archivesBaseName = 'signalr-messagepack' - -task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava +base { + archivesName = 'signalr-messagepack' } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" - from javadoc.destinationDir -} +publishing { + publications { + release(MavenPublication) { + from components.java -task generatePOM { - pom { - project { artifactId 'signalr-messagepack' - inceptionYear '2020' - description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'MIT License' - url 'https://opensource.org/licenses/MIT' - distribution 'repo' + + pom { + packaging = 'jar' + inceptionYear = '2020' + url = 'https://github.com/dotnet/aspnetcore' + name = groupId + ':' + artifactId + description = 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' + licenses { + license { + name = 'MIT License' + url = 'https://opensource.org/licenses/MIT' + distribution = 'repo' + } } - } - scm { - connection 'scm:git:https://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' - url 'https://github.com/dotnet/aspnetcore/tree/main' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' + scm { + connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' + url = 'https://github.com/dotnet/aspnetcore/tree/main' + } + developers { + developer { + id = 'microsoft' + name = 'Microsoft' + } } } } - }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") + } } -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) +tasks.withType(GenerateMavenPom).all { + def matcher = name =~ /generatePomFileFor(\w+)Publication/ + def publicationName = matcher[0][1] + destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile +} diff --git a/src/SignalR/clients/java/signalr/test/build.gradle b/src/SignalR/clients/java/signalr/test/build.gradle index 2fefd54f6481..27b81b32c947 100644 --- a/src/SignalR/clients/java/signalr/test/build.gradle +++ b/src/SignalR/clients/java/signalr/test/build.gradle @@ -1,16 +1,61 @@ -apply plugin: 'org.junit.platform.gradle.plugin' +plugins { + id 'java' +} + +configurations { + antJUnit +} dependencies { - implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2' + testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2' implementation 'com.google.code.gson:gson:2.8.5' - compile 'ch.qos.logback:logback-classic:1.2.3' + implementation 'ch.qos.logback:logback-classic:1.2.3' implementation project(':core') implementation project(':messagepack') - compile project(':messagepack') + implementation project(':messagepack') + antJUnit 'org.apache.ant:ant-junit:1.10.15' +} + +sourceSets { + test { + java { + srcDir 'src' + } + } +} + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } + + reports { + html.required = false + junitXml.outputPerTestCase = true + junitXml.required = true + } +} + +// Merge test results into a single file for Helix to detect JUnit test file +task testReport { + ext { + resultsDir = file("$buildDir/test-results") + mergedFile = "test-results/junit-results.xml" + } + + doLast { + mkdir 'test-results' + ant.taskdef(name: 'junitreport', + classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', + classpath: configurations.antJUnit.asPath) + + ant.junitreport(tofile: mergedFile) { + fileset(dir: resultsDir, includes: '**/TEST-*.xml') + } + } } -junitPlatform { - reportsDir file('test-results') -} \ No newline at end of file +test.finalizedBy(testReport) \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index 3e8dfac79be9..823c53ae8a72 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -49,8 +49,8 @@ - - + + diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index 04b637b1b368..15fa79dbdaf9 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -1,5 +1,5 @@ { - "name": "functionaltests", + "name": "@microsoft/functionaltests", "private": true, "version": "1.0.0", "description": "", diff --git a/src/SignalR/clients/ts/FunctionalTests/yarn.lock b/src/SignalR/clients/ts/FunctionalTests/yarn.lock index f21d4649579c..a8efaf31d4c4 100644 --- a/src/SignalR/clients/ts/FunctionalTests/yarn.lock +++ b/src/SignalR/clients/ts/FunctionalTests/yarn.lock @@ -3205,9 +3205,9 @@ serialize-error@^8.0.0: type-fest "^0.20.2" serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" @@ -3833,7 +3833,7 @@ wrappy@1: dependencies: async-limiter "~1.0.0" -ws@8.11.0, ws@>=7.4.6, ws@^7.2.3, ws@^7.4.5, ws@~8.11.0: +ws@8.11.0, ws@>=7.4.6, ws@^7.2.3, ws@^7.5.10, ws@~8.11.0: version "8.12.1" resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f" integrity sha1-xR5YPXkUC15C45vkjJNBMZQtSo8= diff --git a/src/SignalR/clients/ts/common/package.json b/src/SignalR/clients/ts/common/package.json index 65a622972020..e14e4717c731 100644 --- a/src/SignalR/clients/ts/common/package.json +++ b/src/SignalR/clients/ts/common/package.json @@ -1,5 +1,5 @@ { - "name": "common", + "name": "@microsoft/common", "version": "1.0.0", "description": "Common dependencies used during dev time. DO NOT PUBLISH", "private": true, diff --git a/src/SignalR/clients/ts/common/yarn.lock b/src/SignalR/clients/ts/common/yarn.lock index ecd79106e65f..407387347d13 100644 --- a/src/SignalR/clients/ts/common/yarn.lock +++ b/src/SignalR/clients/ts/common/yarn.lock @@ -3198,9 +3198,9 @@ semver@^6.0.0, semver@^6.3.0: integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha1-sgbvsnw9oLCra1L0jRcLeZZFjlw= + version "6.0.2" + resolved "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha1-3voeBVyDv21Z6oBdjahiJU62psI= dependencies: randombytes "^2.1.0" diff --git a/src/SignalR/clients/ts/package.json b/src/SignalR/clients/ts/package.json index e2c4327c207d..560aeff4d44d 100644 --- a/src/SignalR/clients/ts/package.json +++ b/src/SignalR/clients/ts/package.json @@ -1,5 +1,5 @@ { - "name": "client-ts", + "name": "@microsoft/client-ts", "version": "0.0.0", "description": "Provides a root to run npm scripts from. DO NOT PUBLISH", "private": true, diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index 95119056ee8f..9aeb12b9bdb0 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit 95119056ee8f4da1714b055a4f16893afaa73af7 +Subproject commit 9aeb12b9bdb024512ffe2e4bddfa2785dca6e39e diff --git a/src/submodules/googletest b/src/submodules/googletest index 6dae7eb4a5c3..d14403194054 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 6dae7eb4a5c3a169f3e298392bff4680224aa94a +Subproject commit d144031940543e15423a25ae5a8a74141044862f