diff --git a/eng/pipelines/azure-pipelines-unofficial.yml b/eng/pipelines/azure-pipelines-unofficial.yml index ef0ca001eb1..e4147cdf65d 100644 --- a/eng/pipelines/azure-pipelines-unofficial.yml +++ b/eng/pipelines/azure-pipelines-unofficial.yml @@ -45,7 +45,7 @@ extends: sdl: sourceAnalysisPool: name: NetCore1ESPool-Internal - image: windows.vs2022preview.amd64 + image: windows.vs2026preview.scout.amd64 os: windows containers: linux_x64: @@ -135,7 +135,7 @@ extends: pool: name: NetCore1ESPool-Internal - image: windows.vs2022preview.amd64 + image: windows.vs2026preview.scout.amd64 os: windows variables: @@ -162,6 +162,40 @@ extends: script: | Get-ChildItem -Path "$(Build.SourcesDirectory)\artifacts\packages" -File -Recurse | Select-Object FullName, @{Name="Size(MB)";Expression={[math]::Round($_.Length/1MB,2)}} | Format-Table -AutoSize + - task: NodeTool@0 + displayName: 🟣Install node.js + inputs: + versionSpec: '20.x' + + - task: npmAuthenticate@0 + displayName: 🟣NPM authenticate + inputs: + workingFile: $(Build.SourcesDirectory)\.npmrc + + - task: PowerShell@2 + displayName: 🟣Set .npmrc environment + inputs: + targetType: 'inline' + script: Write-Host "##vso[task.setvariable variable=NPM_CONFIG_USERCONFIG]$(Build.SourcesDirectory)\.npmrc" + + - task: PowerShell@2 + displayName: 🟣Install yarn + inputs: + targetType: 'inline' + script: | + npm install -g yarn@1.22.22 + yarn --version + workingDirectory: '$(Build.SourcesDirectory)' + + - task: PowerShell@2 + displayName: 🟣Install vsce + inputs: + targetType: 'inline' + script: | + npm install -g @vscode/vsce@3.7.1 + vsce --version + workingDirectory: '$(Build.SourcesDirectory)' + - template: /eng/pipelines/templates/BuildAndTest.yml parameters: dotnetScript: $(Build.SourcesDirectory)/dotnet.cmd diff --git a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj index 695484a4be9..f5f6efcf407 100644 --- a/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj +++ b/src/Aspire.Hosting.AppHost/Aspire.Hosting.AppHost.csproj @@ -7,6 +7,7 @@ true aspire hosting Core library and MSBuild logic for Aspire AppHost projects. + true diff --git a/src/Aspire.Hosting.RemoteHost/Aspire.Hosting.RemoteHost.csproj b/src/Aspire.Hosting.RemoteHost/Aspire.Hosting.RemoteHost.csproj index b674702bdfa..96ed28b51f0 100644 --- a/src/Aspire.Hosting.RemoteHost/Aspire.Hosting.RemoteHost.csproj +++ b/src/Aspire.Hosting.RemoteHost/Aspire.Hosting.RemoteHost.csproj @@ -5,6 +5,7 @@ enable enable false + true diff --git a/src/Aspire.Hosting/Aspire.Hosting.csproj b/src/Aspire.Hosting/Aspire.Hosting.csproj index cc7c588988c..c890240b842 100644 --- a/src/Aspire.Hosting/Aspire.Hosting.csproj +++ b/src/Aspire.Hosting/Aspire.Hosting.csproj @@ -142,18 +142,17 @@ + + + + + $(BeforePack);IncludeIntegrationAnalyzerInPackage - - - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index d1bbc9062e9..63c1108cf71 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -3,6 +3,7 @@ true $(MSBuildProjectDirectory)/api/$(AssemblyName).cs + true @@ -15,21 +16,15 @@ - + + OutputItemType="Analyzer" /> +