diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14a3f8f9afda20..598d4b9a4c3d40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -86,77 +86,77 @@ - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 https://github.com/dotnet/runtime-assets @@ -274,9 +274,9 @@ https://github.com/dotnet/xharness a8e8fc0ffeb9b8c56ab799597597ce35d5be6111 - + https://github.com/dotnet/arcade - 3c58477e970334e718adcd6461638ca844395db2 + 60e9ab3c31d68167f8dac5b8e2c536deb12ef737 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c156052dd09503..2f0b63b83d3b2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,22 +57,22 @@ 8.0.100-alpha.1.22462.3 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 2.5.1-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 - 8.0.0-beta.22469.1 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 2.5.1-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 + 8.0.0-beta.22480.2 6.0.0-preview.1.102 @@ -177,7 +177,7 @@ 2.45.0 2.45.0 - 8.0.100-alpha.1.22463.23 + 1.1.2-beta1.22403.2 7.0.0-preview-20220920.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242f6e92..33a6f2d0e24811 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" + Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index ac42f04a9d827d..fbc67effc36311 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -113,6 +113,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 781a41c9404239..65f87b40c66ae3 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -34,7 +34,7 @@ jobs: - job: Run_SDL dependsOn: ${{ parameters.dependsOn }} displayName: Run SDL tool - condition: eq( ${{ parameters.enable }}, 'true') + condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true')) variables: - group: DotNet-VSTS-Bot - name: AzDOProjectName diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 459f3c4fcbb996..9f55d3f466600b 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -25,6 +25,7 @@ parameters: enablePublishTestResults: false enablePublishUsingPipelines: false disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -146,6 +147,8 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - task: ComponentGovernanceComponentDetection@0 continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -223,4 +226,5 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion}} BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3bfd38..bcd8279944ba67 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-latest' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 87fcae940cff07..258ed2d1108102 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -98,7 +98,7 @@ stages: jobs: - job: displayName: NuGet Validation - condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -282,4 +282,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 4cea8c33187c91..a06373f38fa5d5 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -2,12 +2,14 @@ # PackageName - The name of the package this SBOM represents. # PackageVersion - The version of the package this SBOM represents. # ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' sbomContinueOnError: true steps: @@ -34,6 +36,8 @@ steps: BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - task: PublishPipelineArtifact@1 displayName: Publish SBOM manifest diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4624885e3bfebe..a97a185a367a92 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -73,6 +73,11 @@ steps: publishArgs='--publish' fi + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ @@ -82,7 +87,8 @@ steps: $targetRidArgs \ $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName displayName: Build # Upload build logs for diagnosis. diff --git a/global.json b/global.json index 83e1ef37592ad5..cfb2eab45d44ae 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.100-preview.7.22377.5", + "version": "7.0.100-rc.1.22431.12", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.100-preview.7.22377.5" + "dotnet": "7.0.100-rc.1.22431.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22469.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22469.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22469.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22480.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22480.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22475.4" diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config index e7ad45f78b8cab..409ee96f0277b2 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget7.config @@ -8,6 +8,7 @@ + diff --git a/src/mono/wasm/host/WasmAppHost.csproj b/src/mono/wasm/host/WasmAppHost.csproj index 56eef3ea418bfe..8a32ea3332d148 100644 --- a/src/mono/wasm/host/WasmAppHost.csproj +++ b/src/mono/wasm/host/WasmAppHost.csproj @@ -6,6 +6,7 @@ $(NoWarn),CA2007 enable false + LatestMajor