diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8d0f6ac9192b2c8842289d600208676a1a31301e..dd4380991c2a47988cb82268f35e938236245801 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22110.1", + "version": "1.0.0-prerelease.22114.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13de2035332276dbaee823bc8d182aec9a09b9bb..936673dfa74fcf6c9478cb79e26d83f9f26c6eeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - 0431d9e84dc1dd8b63ec71518e16166952294670 + bc6d6740a2b8ba5c2943e1a7a0eaa9781a862050 https://github.com/dotnet/msquic a7213b4676c1803bb251771291a525482d42e511 - + https://github.com/dotnet/emsdk - 96aa78d8d62904171e1a6cd5fe8fc4742254133f + e6541169ee0347b4c3af1b83a0ab9fc19121283c https://github.com/dotnet/wcf @@ -50,209 +50,209 @@ - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 0ffa6d40b8174b06d44814f2c76539be4cdadff9 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - ff6cc4e9c3eef575f62a33a642ca80e79d27c9bb + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/llvm-project - 5b358880114238a553ea86fe087ccb80b17a0017 + b26427d9a80114d6e2cf5c3c4e06fdfa7e87dc4a - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 - + https://github.com/dotnet/runtime - 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 + 6e05d78deba320a54ef10a265c6025bbb686efe6 https://github.com/dotnet/linker 24b988c6b1ca785f15745fb66a1adcb076b4d5e3 - + https://github.com/dotnet/xharness - 1d34249727dd281aad059a9a58880f003bd9f18e + 31b805073edc56934e514f3bcc544d952e19d062 - + https://github.com/dotnet/xharness - 1d34249727dd281aad059a9a58880f003bd9f18e + 31b805073edc56934e514f3bcc544d952e19d062 - + https://github.com/dotnet/xharness - 1d34249727dd281aad059a9a58880f003bd9f18e + 31b805073edc56934e514f3bcc544d952e19d062 - + https://github.com/dotnet/arcade - 78eaf78761027d225030be2b28aaf4e8bf392929 + 6d977266bcc193caedb60a27ae44d14d9a11a040 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -270,17 +270,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 47c55c3cf08885d691aa9d581d40310fe448c1ea - + https://github.com/dotnet/hotreload-utils - c57ee5cc02f5ef566981c6df8ce0465402de81a2 + 8d7976f50a89b3e5912260d3111a9d3135d3ca39 - + https://github.com/dotnet/runtime-assets - 359026fd1eb6864f9c634bff1af6ea4c5e5e75d1 + 39b73ee08e14336994b303d39483b5d6ddfe63e4 - + https://github.com/dotnet/roslyn-analyzers - 54b65374e301686f9475dc02045b370dda116db1 + 97d7b2d0554dda1cccf60f74bcb01ee810cdfc16 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 95ad084ee2a53f8056ccd4c5a5d4556bed5063b0..507101b9dc037d1041db576e3199429ef4e9fb9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,37 +51,37 @@ 3.3.2 4.0.1 4.0.1 - 7.0.0-preview1.22109.1 + 7.0.0-preview1.22115.3 4.2.0-2.22105.4 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 2.5.1-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22114.8 - 7.0.0-beta.22110.7 - 7.0.0-beta.22111.10 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 - 7.0.0-beta.22110.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 2.5.1-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 + 7.0.0-beta.22114.7 6.0.0-preview.1.102 - 7.0.0-preview.2.22103.2 - 7.0.0-preview.2.22103.2 - 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22113.2 + 7.0.0-preview.2.22113.2 + 7.0.0-preview.2.22113.2 3.1.0 - 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22113.2 1.0.0-alpha.1.22104.2 1.0.0-alpha.1.22104.2 1.0.0-alpha.1.22104.2 @@ -124,24 +124,24 @@ 5.0.0 5.0.0 4.9.0 - 7.0.0-preview.2.22103.2 - 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22113.2 + 7.0.0-preview.2.22113.2 4.5.4 4.5.0 - 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22113.2 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 - 7.0.0-beta.22107.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 + 7.0.0-beta.22115.1 1.0.0-prerelease.22078.3 1.0.0-prerelease.22078.3 @@ -164,10 +164,10 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22110.1 - 1.0.0-prerelease.22110.1 - 1.0.0-prerelease.22110.1 - 1.0.2-alpha.0.22107.2 + 1.0.0-prerelease.22114.1 + 1.0.0-prerelease.22114.1 + 1.0.0-prerelease.22114.1 + 1.0.2-alpha.0.22114.2 2.4.2-pre.22 0.12.0-pre.20 2.4.2 @@ -184,20 +184,20 @@ 7.0.100-1.22107.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.2.22107.1 + 7.0.0-preview.3.22115.2 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 - 11.1.0-alpha.1.22107.4 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 + 11.1.0-alpha.1.22114.2 - 7.0.0-alpha.2.22104.1 + 7.0.0-alpha.2.22111.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 3acba705f177cfa6113d05cd6c999affae87cee4..4cea8c33187c9133174aa6c1cc91474715051bcf 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -18,7 +18,9 @@ steps: filePath: ./eng/common/generate-sbom-prep.ps1 arguments: ${{parameters.manifestDirPath}} +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 - script: | + chmod +x ./eng/common/generate-sbom-prep.sh ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} displayName: Prep for SBOM generation in (Linux) condition: eq(variables['Agent.Os'], 'Linux') diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 5297af6e3e4f7b15f37bf97ec81a5fafcbbc6ad4..0bea2e67bff143ac355e88086d3284ba6b8a65db 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -14,7 +14,7 @@ steps: displayName: Restore blob feed tasks (Windows) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }}) - - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci ${{ parameters.sendParams }} + - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci -warnaserror 0 ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }}) env: ${{ parameters.environment }} @@ -22,7 +22,7 @@ steps: - ${{ if ne(parameters.osGroup, 'windows') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. - - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} + - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --warnaserror false ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Unix) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }}) ${{ if eq(parameters.osGroup, 'FreeBSD') }}: diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 00a810ae63c2eab1db024a07d27bcebcf81ff1c6..6ea24574d3a768fbcb0274994aec7880fe450f83 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -67,6 +67,8 @@ jobs: value: '\' - name: _msbuildCommand value: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -ci + - name: _warnAsErrorParamHelixOverride + value: -warnaserror 0 - name: setScriptToEchoAndFailOnNonZero value: '' - name: logRootNameArg @@ -85,6 +87,8 @@ jobs: value: '/' - name: _msbuildCommand value: ./eng/common/msbuild.sh --ci + - name: _warnAsErrorParamHelixOverride + value: --warnaserror false # Set the bash script to display each command, and stop if any command exits nonzero. - name: setScriptToEchoAndFailOnNonZero value: 'set -xe' diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index a8b6517efeb87408b96c165547d255a1239a8f19..52b5958fd248929476f5856301b7518c352f7a0b 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -15,7 +15,7 @@ parameters: scenarios: '' steps: - - script: $(_msbuildCommand) -restore + - script: $(_msbuildCommand) $(_warnAsErrorParamHelixOverride) -restore $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj /p:RuntimeFlavor=${{ parameters.runtimeFlavor }} /p:TargetArchitecture=${{ parameters.archType }} diff --git a/global.json b/global.json index 74fffa1e3eb804a521b04e38d5a05f6eedf29da8..7850e7db3d02404ad3ade495e4e926133b183472 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22110.7", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22110.7", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22114.7", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22114.7", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22114.7", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22103.2" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22113.2" } }