diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37cc0681fbf..e39fc127a11 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21373.1", + "version": "1.0.0-prerelease.21404.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4217a76551..553c50195ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,234 +1,234 @@ - + https://github.com/dotnet/icu - 08293141bc33a81b7e58120535079d8eac36519f + 662f7844f6abda0f24549679894d825c8cc247c2 https://github.com/dotnet/msquic - d7db669b70f4dd67ec001c192f9809c218cab88b + deb3a26c20315aa4c659079071b821e5d5230242 - + https://github.com/dotnet/emsdk - 7a7664b07a1625bc1682e0735019178e69fcfbec + a4b73e3e43d8a23a467016f1ffb22ab4821da774 - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - 35a36a8ec705945b20275a7d63478affb396ff89 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc - + https://github.com/dotnet/llvm-project - 0b7a170df4f963b7b91e368f5d14a0be9e984c82 + 027d12b95640cbaa416e09c6b0ed53a58a2ad7dc https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d https://github.com/dotnet/runtime 95863758cd16c345d0b8fca067d5db5d6901e498 - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + d90f6b6c86be7001dc839e147ab229dfd1c7d20d https://github.com/mono/linker ffe71535ba927280e6e93db0ca04dd99bde07637 - + https://github.com/dotnet/xharness - ccb49ae05b6d98b29871a1779408d4579e16d6e5 + e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/xharness - ccb49ae05b6d98b29871a1779408d4579e16d6e5 + e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - c6a28c81f96d196338b3ea520bc1e6dc7c440ee2 + 0bb1ae8e4c33203b81c9ed24e418a2b70f3c17ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - f8742ac0820e98221e7eec5f13989d9538579399 + 60bf5650ba15cc46cec560bcee2bd45080873176 - + https://github.com/dotnet/hotreload-utils - 312d3ada595616e44ad827f64231109dc4ea1431 + 187d28ec14993a75eb7d2a72fc12f336efafe138 - + https://github.com/dotnet/runtime-assets - bcfd1993de3767c54c6d8a522bf63770fba3c98d + 07259c6fd799b74979769501c6da609c6a53061d - + https://github.com/dotnet/roslyn-analyzers - 19af44783ceecc31842d7028e3b0ce83095ea166 + 92cc1339befaae2508da6480dcc7b29ebb1d5f67 diff --git a/eng/Versions.props b/eng/Versions.props index d9098c9f131..9bcc7facdfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,33 +50,33 @@ 3.10.0 3.10.0 - 6.0.0-rc1.21375.2 + 6.0.0-rc1.21378.3 1.0.0-rc.1.21404.21 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 2.5.1-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21403.2 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21373.11 - 6.0.0-beta.21402.1 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 2.5.1-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 + 6.0.0-beta.21405.3 6.0.0-preview.1.102 6.0.0-alpha.1.20612.4 - 6.0.0-rc.1.21375.2 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21401.3 3.1.0 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 5.0.0 4.3.0 @@ -110,27 +110,27 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-rc.1.21375.2 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21401.3 + 6.0.0-rc.1.21401.3 4.5.4 4.5.0 6.0.0-rc.1.21375.2 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 - 6.0.0-beta.21371.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 + 6.0.0-beta.21405.1 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 - 1.0.0-prerelease.21374.3 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 + 1.0.0-prerelease.21379.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -154,9 +154,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21373.1 - 1.0.0-prerelease.21373.1 - 1.0.2-alpha.0.21402.1 + 1.0.0-prerelease.21404.1 + 1.0.0-prerelease.21404.1 + 1.0.2-alpha.0.21404.1 2.4.1 2.4.2 1.3.0 @@ -171,20 +171,20 @@ 6.0.100-preview.6.21405.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21369.1 + 6.0.0-rc.1.21402.1 6.0.0-preview.7.21379.5 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 - 11.1.0-alpha.1.21369.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 + 11.1.0-alpha.1.21402.1 - 6.0.0-rc.1.21376.4 + 6.0.0-rc.1.21378.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 735a4c82838..59714ff5c34 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -7,9 +7,9 @@ usage() echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), armel, arm64, x86" echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd11 or freebsd12." + echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13" echo " for illumos can be: illumos." - echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD" + echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." exit 1 @@ -60,13 +60,15 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.1-RELEASE" +__FreeBSDBase="12.2-RELEASE" __FreeBSDPkg="1.12.0" +__FreeBSDABI="12" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" __FreeBSDPackages+=" lttng-ust" __FreeBSDPackages+=" krb5" +__FreeBSDPackages+=" terminfo-db" __IllumosPackages="icu-64.2nb2" __IllumosPackages+=" mit-krb5-1.16.2nb4" @@ -208,12 +210,20 @@ while :; do ;; freebsd11) __FreeBSDBase="11.3-RELEASE" + __FreeBSDABI="11" ;& freebsd12) __CodeName=freebsd __BuildArch=x64 __SkipUnmount=1 ;; + freebsd13) + __CodeName=freebsd + __FreeBSDBase="13.0-RELEASE" + __FreeBSDABI="13" + __BuildArch=x64 + __SkipUnmount=1 + ;; illumos) __CodeName=illumos __BuildArch=x64 @@ -291,9 +301,9 @@ if [[ "$__CodeName" == "alpine" ]]; then rm -r $__ApkToolsDir elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p $__RootfsDir/usr/local/etc + JOBS="$(getconf _NPROCESSORS_ONLN)" wget -O - https://download.freebsd.org/ftp/releases/amd64/${__FreeBSDBase}/base.txz | tar -C $__RootfsDir -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version - # For now, ask for 11 ABI even on 12. This can be revisited later. - echo "ABI = \"FreeBSD:11:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf + echo "ABI = \"FreeBSD:${__FreeBSDABI}:amd64\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > ${__RootfsDir}/usr/local/etc/pkg.conf echo "FreeBSD: { url: "pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > ${__RootfsDir}/etc/pkg/FreeBSD.conf mkdir -p $__RootfsDir/tmp # get and build package manager @@ -301,7 +311,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then cd $__RootfsDir/tmp/pkg-${__FreeBSDPkg} # needed for install to succeed mkdir -p $__RootfsDir/host/etc - ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make && make install + ./autogen.sh && ./configure --prefix=$__RootfsDir/host && make -j "$JOBS" && make install rm -rf $__RootfsDir/tmp/pkg-${__FreeBSDPkg} # install packages we need. INSTALL_AS_USER=$(whoami) $__RootfsDir/host/sbin/pkg -r $__RootfsDir -C $__RootfsDir/usr/local/etc/pkg.conf update diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2e3..beb9c4648ea 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,5 +1,4 @@ - - + net472 diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml deleted file mode 100644 index 0123cf43b16..00000000000 --- a/eng/common/templates/phases/base.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - # Optional: Clean sources before building - clean: true - - # Optional: Git fetch depth - fetchDepth: '' - - # Optional: name of the phase (not specifying phase name may cause name collisions) - name: '' - # Optional: display name of the phase - displayName: '' - - # Optional: condition for the job to run - condition: '' - - # Optional: dependencies of the phase - dependsOn: '' - - # Required: A defined YAML queue - queue: {} - - # Required: build steps - steps: [] - - # Optional: variables - variables: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - ## Telemetry variables - - # Optional: enable sending telemetry - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _HelixBuildConfig - differentiate between Debug, Release, other - # _HelixSource - Example: build/product - # _HelixType - Example: official/dotnet/arcade/$(Build.SourceBranch) - enableTelemetry: false - - # Optional: Enable installing Microbuild plugin - # if 'true', these "variables" must be specified in the variables object or as part of the queue matrix - # _TeamName - the name of your team - # _SignType - 'test' or 'real' - enableMicrobuild: false - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -phases: -- phase: ${{ parameters.name }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - queue: ${{ parameters.queue }} - - ${{ if ne(parameters.variables, '') }}: - variables: - ${{ insert }}: ${{ parameters.variables }} - - steps: - - checkout: self - clean: ${{ parameters.clean }} - ${{ if ne(parameters.fetchDepth, '') }}: - fetchDepth: ${{ parameters.fetchDepth }} - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-start.yml - parameters: - buildConfig: $(_HelixBuildConfig) - helixSource: $(_HelixSource) - helixType: $(_HelixType) - runAsPublic: ${{ parameters.runAsPublic }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildSigningPlugin@2 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - - env: - TeamName: $(_TeamName) - continueOnError: false - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - # Run provided build steps - - ${{ parameters.steps }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - # Internal only resources - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - env: - TeamName: $(_TeamName) - - - ${{ if eq(parameters.enableTelemetry, 'true') }}: - - template: /eng/common/templates/steps/telemetry-end.yml - parameters: - helixSource: $(_HelixSource) - helixType: $(_HelixType) - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: CopyFiles@2 - displayName: Gather Asset Manifests - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest' - TargetFolder: '$(Build.StagingDirectory)/AssetManifests' - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) - - task: PublishBuildArtifacts@1 - displayName: Push Asset Manifests - inputs: - PathtoPublish: '$(Build.StagingDirectory)/AssetManifests' - PublishLocation: Container - ArtifactName: AssetManifests - continueOnError: false - condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml deleted file mode 100644 index 4e51e472e2b..00000000000 --- a/eng/common/templates/phases/publish-build-assets.yml +++ /dev/null @@ -1,52 +0,0 @@ -parameters: - dependsOn: '' - queue: {} - configuration: 'Debug' - condition: succeeded() - continueOnError: false - runAsPublic: false - publishUsingPipelines: false -phases: - - phase: Asset_Registry_Publish - displayName: Publish to Build Asset Registry - dependsOn: ${{ parameters.dependsOn }} - queue: ${{ parameters.queue }} - variables: - _BuildConfig: ${{ parameters.configuration }} - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: AzureKeyVault@1 - inputs: - azureSubscription: 'DotNet-Engineering-Services_KeyVault' - KeyVaultName: EngKeyVault - SecretsFilter: 'MaestroAccessToken' - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:Configuration=$(_BuildConfig) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_Asset_Registry_Publish - continueOnError: true - condition: always() diff --git a/global.json b/global.json index 0ad0d20174f..a769292d136 100644 --- a/global.json +++ b/global.json @@ -12,12 +12,13 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21373.11", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21405.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21405.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2" + "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21401.3" } } diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs index f58e10b8403..37122859b1e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/JsonConsoleFormatterTests.cs @@ -36,7 +36,7 @@ namespace Microsoft.Extensions.Logging.Console.Test // Act using (logger.BeginScope("Scope with named parameter {namedParameter}", 123)) using (logger.BeginScope("SimpleScope")) - logger.Log(LogLevel.Warning, 0, "Message with {args}", 73, _defaultFormatter); + logger.Log(LogLevel.Warning, 0, "Message with {args}", 73); // Assert Assert.Equal(1, sink.Writes.Count); diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs index 4dc7c374268..5cc5df79144 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs +++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs @@ -84,7 +84,7 @@ namespace Microsoft.WebAssembly.Diagnostics { if (a.Type != JTokenType.Array) { - logger.LogDebug("Invalid event raised args, expected an array: {a}"); + logger.LogDebug($"Invalid event raised args, expected an array: {a.Type}"); } else {