From 660fd7a768e33798ed9650ffa8b2bba1cdb781ab Mon Sep 17 00:00:00 2001 From: sfoslund Date: Fri, 6 Mar 2020 15:51:55 -0800 Subject: [PATCH 01/98] Adding support for win arm64 builds --- .vsts-ci.yml | 4 ++++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index cef288de0..2954264c2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -68,6 +68,10 @@ stages: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' - template: /eng/build.yml parameters: diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index b0aa36fea..1c19fd24c 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,6 +1,6 @@ diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index f9560416e..242b7a678 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -283,7 +283,7 @@ false - true + true false From 3d5f0cafa683d610e33542cf3b6b3a972d3c402a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 00:50:57 +0000 Subject: [PATCH 02/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.6 (#6716) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20156.6 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20156.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20156.6 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20156.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 347c7c73f..2fe71e9bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + 92a5e7ca45f03871f7635d975fe059a222935f3d - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + 92a5e7ca45f03871f7635d975fe059a222935f3d - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + 92a5e7ca45f03871f7635d975fe059a222935f3d https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 97250206203b7ffeffe6b0ebde69e3fd54b740fe - + https://github.com/dotnet/wpf - d9b7449f29c21e5c13ca0ee462600233138443b4 + 2ac6cbc468bae41a5834d06d13ea914f2e7f635e diff --git a/eng/Versions.props b/eng/Versions.props index d23443036..f1af84f2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20156.3 + 5.0.0-preview.3.20156.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20156.5 - 5.0.0-preview.3.20156.5 - 5.0.0-preview.3.20156.5 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 From 399521ef66847acf2976c747fa1e133fdb7981c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 02:05:59 +0000 Subject: [PATCH 03/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.7 (#6717) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20156.7 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20156.7 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20156.7 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20156.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fe71e9bd..3e8f022be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 92a5e7ca45f03871f7635d975fe059a222935f3d + 511afd82ddd04850d51a1e91377c7cb6a0d78d25 - + https://github.com/dotnet/windowsdesktop - 92a5e7ca45f03871f7635d975fe059a222935f3d + 511afd82ddd04850d51a1e91377c7cb6a0d78d25 - + https://github.com/dotnet/windowsdesktop - 92a5e7ca45f03871f7635d975fe059a222935f3d + 511afd82ddd04850d51a1e91377c7cb6a0d78d25 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 97250206203b7ffeffe6b0ebde69e3fd54b740fe - + https://github.com/dotnet/wpf - 2ac6cbc468bae41a5834d06d13ea914f2e7f635e + 5841f8b2984301b6fe8a8153c30e8c13cad2eb16 diff --git a/eng/Versions.props b/eng/Versions.props index f1af84f2d..c4c9ea4cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20156.4 + 5.0.0-preview.3.20156.6 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.7 + 5.0.0-preview.3.20156.7 + 5.0.0-preview.3.20156.7 From ea805bb7956c82808e856cb6bae7c386510ebd14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 03:45:59 +0000 Subject: [PATCH 04/98] Update dependencies from https://github.com/dotnet/aspnetcore build 20200306.6 (#6721) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20156.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20156.6 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20156.6 - dotnet-watch - 5.0.0-preview.3.20156.6 - dotnet-user-secrets - 5.0.0-preview.3.20156.6 - dotnet-dev-certs - 5.0.0-preview.3.20156.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e8f022be..51fa8625d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e2881ae96bb4399864723aa46469c82379b03b32 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 9f5686232043b8a740128fbf6ad3bf1aaf9653ca https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c4c9ea4cb..db6d4acf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20156.6 0.2.0 From 12a3b1a688d195691c91968680d360e1c7bdae6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 10:26:06 +0000 Subject: [PATCH 05/98] [master] Update dependencies from dotnet/sdk (#6712) * Update dependencies from https://github.com/dotnet/sdk build 20200306.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20156.2 - Microsoft.NET.Sdk - 5.0.100-preview.2.20156.2 * Update dependencies from https://github.com/dotnet/sdk build 20200306.7 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20156.7 - Microsoft.NET.Sdk - 5.0.100-preview.2.20156.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51fa8625d..85a6cb4b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 93cc90f8d2b078a699888ade16f82060131798e8 + 2ccaa037745ac05043ce1f9420cca121754b6e8b - + https://github.com/dotnet/sdk - 93cc90f8d2b078a699888ade16f82060131798e8 + 2ccaa037745ac05043ce1f9420cca121754b6e8b diff --git a/eng/Versions.props b/eng/Versions.props index db6d4acf7..4fb8fe114 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20156.1 - 5.0.100-preview.2.20156.1 + 5.0.100-preview.2.20156.7 + 5.0.100-preview.2.20156.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8442706437dc408ff60438b68e01b2543353cd03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 15:10:55 +0000 Subject: [PATCH 06/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200307.1 (#6725) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20157.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20157.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20157.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85a6cb4b9..ef83872d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 511afd82ddd04850d51a1e91377c7cb6a0d78d25 + 7aadbf87bfca04c50c0978848a7383f1075d9772 - + https://github.com/dotnet/windowsdesktop - 511afd82ddd04850d51a1e91377c7cb6a0d78d25 + 7aadbf87bfca04c50c0978848a7383f1075d9772 - + https://github.com/dotnet/windowsdesktop - 511afd82ddd04850d51a1e91377c7cb6a0d78d25 + 7aadbf87bfca04c50c0978848a7383f1075d9772 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4fb8fe114..f9c03ffab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20156.7 - 5.0.0-preview.3.20156.7 - 5.0.0-preview.3.20156.7 + 5.0.0-preview.3.20157.1 + 5.0.0-preview.3.20157.1 + 5.0.0-preview.3.20157.1 From 79a8c80e92c16e23af36511ae73770d7f09a3d13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 17:55:58 +0000 Subject: [PATCH 07/98] Update dependencies from https://github.com/dotnet/sdk build 20200307.1 (#6726) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20157.1 - Microsoft.NET.Sdk - 5.0.100-preview.2.20157.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef83872d8..c4797c762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 2ccaa037745ac05043ce1f9420cca121754b6e8b + 1b75e281ea677738ae42f99b81fc09c61f63c3b9 - + https://github.com/dotnet/sdk - 2ccaa037745ac05043ce1f9420cca121754b6e8b + 1b75e281ea677738ae42f99b81fc09c61f63c3b9 diff --git a/eng/Versions.props b/eng/Versions.props index f9c03ffab..36e362561 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20156.7 - 5.0.100-preview.2.20156.7 + 5.0.100-preview.2.20157.1 + 5.0.100-preview.2.20157.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac9888bc165b15d98238d705b21dda193cfcface Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2020 12:38:05 +0000 Subject: [PATCH 08/98] [master] Update dependencies from dotnet/arcade (#6724) * Update dependencies from https://github.com/dotnet/arcade build 20200306.4 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20156.4 * Update dependencies from https://github.com/dotnet/arcade build 20200307.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20157.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +- eng/common/cross/android/arm/toolchain.cmake | 41 ----------- .../cross/android/arm64/toolchain.cmake | 42 ----------- eng/common/cross/build-android-rootfs.sh | 69 +++++++------------ eng/common/cross/toolchain.cmake | 30 ++++++-- global.json | 2 +- 6 files changed, 54 insertions(+), 134 deletions(-) delete mode 100644 eng/common/cross/android/arm/toolchain.cmake delete mode 100644 eng/common/cross/android/arm64/toolchain.cmake diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4797c762..804634d8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 08eea2b992d991297fc23de413bddfb9b3db5082 + ca67e6af5b3c6d94755f0912c5365bea44130b12 diff --git a/eng/common/cross/android/arm/toolchain.cmake b/eng/common/cross/android/arm/toolchain.cmake deleted file mode 100644 index a7e1c7350..000000000 --- a/eng/common/cross/android/arm/toolchain.cmake +++ /dev/null @@ -1,41 +0,0 @@ -set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) -set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) -set(CLR_CMAKE_PLATFORM_ANDROID "Android") - -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR arm) - -## Specify the toolchain -set(TOOLCHAIN "arm-linux-androideabi") -set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) -set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) - -find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) -find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) -find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) - -add_compile_options(--sysroot=${CROSS_ROOTFS}) -add_compile_options(-fPIE) -add_compile_options(-mfloat-abi=soft) -include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/) -include_directories(SYSTEM ${CROSS_NDK_TOOLCHAIN}/include/c++/4.9.x/arm-linux-androideabi/) - -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) - -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/eng/common/cross/android/arm64/toolchain.cmake b/eng/common/cross/android/arm64/toolchain.cmake deleted file mode 100644 index 29415899c..000000000 --- a/eng/common/cross/android/arm64/toolchain.cmake +++ /dev/null @@ -1,42 +0,0 @@ -set(CROSS_NDK_TOOLCHAIN $ENV{ROOTFS_DIR}/../) -set(CROSS_ROOTFS ${CROSS_NDK_TOOLCHAIN}/sysroot) -set(CLR_CMAKE_PLATFORM_ANDROID "Android") - -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR aarch64) - -## Specify the toolchain -set(TOOLCHAIN "aarch64-linux-android") -set(CMAKE_PREFIX_PATH ${CROSS_NDK_TOOLCHAIN}) -set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-) - -find_program(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}clang++) -find_program(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}clang) -find_program(CMAKE_AR ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_LD ${TOOLCHAIN_PREFIX}ar) -find_program(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy) -find_program(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump) - -add_compile_options(--sysroot=${CROSS_ROOTFS}) -add_compile_options(-fPIE) - -## Needed for Android or bionic specific conditionals -add_compile_options(-D__ANDROID__) -add_compile_options(-D__BIONIC__) - -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}") -set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -fPIE -pie") - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) - -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index adceda877..5e74881eb 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -e -__NDK_Version=r14 +__NDK_Version=r21 usage() { @@ -16,11 +16,11 @@ usage() echo. echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation," echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK." - echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.21-arm64. This file is to replace '/etc/os-release', which is not available for Android." + echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android." exit 1 } -__ApiLevel=21 # The minimum platform for arm64 is API level 21 +__ApiLevel=28 # The minimum platform for arm64 is API level 21 but the minimum version that support glob(3) is 28. See $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/glob.h __BuildArch=arm64 __AndroidArch=aarch64 __AndroidToolchain=aarch64-linux-android @@ -54,12 +54,11 @@ done # Obtain the location of the bash script to figure out where the root of the repo is. __CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +__Android_Cross_Dir="$(cd "$__CrossDir/../../../.tools/android-rootfs" && pwd)" -__Android_Cross_Dir="$__CrossDir/android-rootfs" __NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" -__libunwind_Dir="$__Android_Cross_Dir/libunwind" __lldb_Dir="$__Android_Cross_Dir/lldb" -__ToolchainDir="$__Android_Cross_Dir/toolchain/$__BuildArch" +__ToolchainDir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" if [[ -n "$TOOLCHAIN_DIR" ]]; then __ToolchainDir=$TOOLCHAIN_DIR @@ -89,49 +88,33 @@ if [ ! -d $__lldb_Dir ]; then unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir fi -# Create the RootFS for both arm64 as well as aarch -rm -rf $__Android_Cross_Dir/toolchain - -echo Generating the $__BuildArch toolchain -$__NDK_Dir/build/tools/make_standalone_toolchain.py --arch $__BuildArch --api $__ApiLevel --install-dir $__ToolchainDir - -# Install the required packages into the toolchain -# TODO: Add logic to get latest pkg version instead of specific version number -rm -rf $__Android_Cross_Dir/deb/ -rm -rf $__Android_Cross_Dir/tmp - -mkdir -p $__Android_Cross_Dir/deb/ +echo "Download dependencies..." mkdir -p $__Android_Cross_Dir/tmp/$arch/ -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libicu-dev_60.2_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob-dev_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-glob_0.4_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support-dev_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libandroid-support_22_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma-dev_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/liblzma_5.2.3_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind-dev_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb -wget -nv -nc http://termux.net/dists/stable/main/binary-$__AndroidArch/libunwind_1.2.20170304_$__AndroidArch.deb -O $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb +# combined dependencies for coreclr, installer and libraries +__AndroidPackages="libicu" +__AndroidPackages+=" libandroid-glob" +__AndroidPackages+=" liblzma" +__AndroidPackages+=" krb5" +__AndroidPackages+=" openssl" -echo Unpacking Termux packages -dpkg -x $__Android_Cross_Dir/deb/libicu_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libicu-dev_60.2_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-glob-dev_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-glob_0.4_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-support-dev_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libandroid-support_22_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/liblzma-dev_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/liblzma_5.2.3_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libunwind-dev_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ -dpkg -x $__Android_Cross_Dir/deb/libunwind_1.2.20170304_$__AndroidArch.deb $__Android_Cross_Dir/tmp/$__AndroidArch/ +for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\ + grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do + + if [[ "$path" != "Filename:" ]]; then + echo "Working on: $path" + wget -qO- http://termux.net/$path | dpkg -x - $__Android_Cross_Dir/tmp/$__AndroidArch/ + fi +done cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/ # Generate platform file for build.sh script to assign to __DistroRid echo "Generating platform file..." +echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform -echo "RID=android.21-arm64" > $__ToolchainDir/sysroot/android_platform -echo Now run: -echo CONFIG_DIR=\`realpath cross/android/$__BuildArch\` ROOTFS_DIR=\`realpath $__ToolchainDir/sysroot\` ./build.sh cross $__BuildArch skipgenerateversion skipnuget cmakeargs -DENABLE_LLDBPLUGIN=0 - +echo "Now to build coreclr, libraries and installers; run:" +echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ + --subsetCategory coreclr \ + --subsetCategory libraries \ + --subsetCategory installer diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 556da2e13..1823804da 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -43,10 +43,30 @@ if(TARGET_ARCH_NAME STREQUAL "armel") endif() endif() -set(CMAKE_SYSROOT "${CROSS_ROOTFS}") -set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") -set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") -set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") +if("$ENV{__DistroRid}" MATCHES "android.*") + if(TARGET_ARCH_NAME STREQUAL "arm") + set(ANDROID_ABI armeabi-v7a) + elseif(TARGET_ARCH_NAME STREQUAL "arm64") + set(ANDROID_ABI arm64-v8a) + endif() + + # extract platform number required by the NDK's toolchain + string(REGEX REPLACE ".*\\.([0-9]+)-.*" "\\1" ANDROID_PLATFORM "$ENV{__DistroRid}") + + set(ANDROID_TOOLCHAIN clang) + set(FEATURE_EVENT_TRACE 0) # disable event trace as there is no lttng-ust package in termux repository + set(CMAKE_SYSTEM_LIBRARY_PATH "${CROSS_ROOTFS}/usr/lib") + set(CMAKE_SYSTEM_INCLUDE_PATH "${CROSS_ROOTFS}/usr/include") + + # include official NDK toolchain script + include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) +else() + set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + + set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") + set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") + set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") +endif() # Specify link flags @@ -63,7 +83,7 @@ endif() # Specify compile options -if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") +if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$" AND NOT "$ENV{__DistroRid}" MATCHES "android.*") set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/global.json b/global.json index c33d33cb6..2b634f734 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20155.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20157.1" } } From ea1cde7af0a9b67677577ec82009e1f249371272 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2020 14:07:54 +0000 Subject: [PATCH 09/98] [master] Update dependencies from dotnet/windowsdesktop (#6727) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200307.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20157.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20157.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20157.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20157.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200308.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20158.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20158.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20158.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20157.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 804634d8a..91036636c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 7aadbf87bfca04c50c0978848a7383f1075d9772 + 790d561a48c9f45fbb7c17c8f9c94f58f72af86e - + https://github.com/dotnet/windowsdesktop - 7aadbf87bfca04c50c0978848a7383f1075d9772 + 790d561a48c9f45fbb7c17c8f9c94f58f72af86e - + https://github.com/dotnet/windowsdesktop - 7aadbf87bfca04c50c0978848a7383f1075d9772 + 790d561a48c9f45fbb7c17c8f9c94f58f72af86e https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 97250206203b7ffeffe6b0ebde69e3fd54b740fe - + https://github.com/dotnet/wpf - 5841f8b2984301b6fe8a8153c30e8c13cad2eb16 + b3a6983e25e396bb06c99520b4a0252231024828 diff --git a/eng/Versions.props b/eng/Versions.props index 36e362561..494e1ff5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20157.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20157.1 - 5.0.0-preview.3.20157.1 - 5.0.0-preview.3.20157.1 + 5.0.0-preview.3.20158.1 + 5.0.0-preview.3.20158.1 + 5.0.0-preview.3.20158.1 From b421395e4eb6ebff5425254a0f85a20ff58e16c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2020 15:56:25 +0000 Subject: [PATCH 10/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200308.2 (#6728) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20158.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20158.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20158.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20158.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91036636c..caf5980ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 790d561a48c9f45fbb7c17c8f9c94f58f72af86e + 36063dbf4cb0fe40d4a0172873f70bf968d416f8 - + https://github.com/dotnet/windowsdesktop - 790d561a48c9f45fbb7c17c8f9c94f58f72af86e + 36063dbf4cb0fe40d4a0172873f70bf968d416f8 - + https://github.com/dotnet/windowsdesktop - 790d561a48c9f45fbb7c17c8f9c94f58f72af86e + 36063dbf4cb0fe40d4a0172873f70bf968d416f8 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 97250206203b7ffeffe6b0ebde69e3fd54b740fe - + https://github.com/dotnet/wpf - b3a6983e25e396bb06c99520b4a0252231024828 + 109bee0a33579b6ad34166304887499a68942da0 diff --git a/eng/Versions.props b/eng/Versions.props index 494e1ff5a..d173e5368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20157.2 + 5.0.0-preview.3.20158.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20158.1 - 5.0.0-preview.3.20158.1 - 5.0.0-preview.3.20158.1 + 5.0.0-preview.3.20158.2 + 5.0.0-preview.3.20158.2 + 5.0.0-preview.3.20158.2 From ca1dc95fc2e38a20370a2507530fef804fecc3cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2020 19:11:00 +0000 Subject: [PATCH 11/98] Update dependencies from https://github.com/dotnet/sdk build 20200308.1 (#6729) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20158.1 - Microsoft.NET.Sdk - 5.0.100-preview.2.20158.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caf5980ff..0434bb138 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 1b75e281ea677738ae42f99b81fc09c61f63c3b9 + 49a2c0dc7e09b5601bedb56bb305e6acd42042ed - + https://github.com/dotnet/sdk - 1b75e281ea677738ae42f99b81fc09c61f63c3b9 + 49a2c0dc7e09b5601bedb56bb305e6acd42042ed diff --git a/eng/Versions.props b/eng/Versions.props index d173e5368..cfd70cab2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20157.1 - 5.0.100-preview.2.20157.1 + 5.0.100-preview.2.20158.1 + 5.0.100-preview.2.20158.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e12ef55274c3533f49a90ec931dedc9bec39fed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Mar 2020 23:00:52 +0000 Subject: [PATCH 12/98] Update dependencies from https://github.com/dotnet/sdk build 20200308.2 (#6730) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20158.2 - Microsoft.NET.Sdk - 5.0.100-preview.2.20158.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0434bb138..89c6a8e82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 49a2c0dc7e09b5601bedb56bb305e6acd42042ed + 6addd9b6386a762737e60e49c9fba18645d01510 - + https://github.com/dotnet/sdk - 49a2c0dc7e09b5601bedb56bb305e6acd42042ed + 6addd9b6386a762737e60e49c9fba18645d01510 diff --git a/eng/Versions.props b/eng/Versions.props index cfd70cab2..73600ebb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20158.1 - 5.0.100-preview.2.20158.1 + 5.0.100-preview.2.20158.2 + 5.0.100-preview.2.20158.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db7552d4fb2c91430ca3c44a72b3dcc9c9c2bc96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 04:06:15 +0000 Subject: [PATCH 13/98] [master] Update dependencies from dotnet/windowsdesktop (#6731) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200308.4 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20158.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20158.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20158.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20158.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20158.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200308.5 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20158.5 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20158.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20158.5 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20157.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20158.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c6a8e82..4403afe8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 36063dbf4cb0fe40d4a0172873f70bf968d416f8 + 0114276a943f6878c74e3315a1e42b1e297d3b1f - + https://github.com/dotnet/windowsdesktop - 36063dbf4cb0fe40d4a0172873f70bf968d416f8 + 0114276a943f6878c74e3315a1e42b1e297d3b1f - + https://github.com/dotnet/windowsdesktop - 36063dbf4cb0fe40d4a0172873f70bf968d416f8 + 0114276a943f6878c74e3315a1e42b1e297d3b1f https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 6addd9b6386a762737e60e49c9fba18645d01510 - + https://github.com/dotnet/winforms - 97250206203b7ffeffe6b0ebde69e3fd54b740fe + 062c02ed4cdceb5803bad0b66e7770987356b14c - + https://github.com/dotnet/wpf - 109bee0a33579b6ad34166304887499a68942da0 + 54abd799f9419ae5a43c84e461a8aa3e8910fa3f diff --git a/eng/Versions.props b/eng/Versions.props index 73600ebb0..47b309746 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20155.2 + 5.0.0-preview.3.20157.1 - 5.0.0-preview.3.20158.1 + 5.0.0-preview.3.20158.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20158.2 - 5.0.0-preview.3.20158.2 - 5.0.0-preview.3.20158.2 + 5.0.0-preview.3.20158.5 + 5.0.0-preview.3.20158.5 + 5.0.0-preview.3.20158.5 From e638be300c47270a79b4802756301ef857c09b30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 06:51:04 +0000 Subject: [PATCH 14/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200308.6 (#6733) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20158.6 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20158.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20158.6 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20158.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20158.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4403afe8d..4a0986d49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 0114276a943f6878c74e3315a1e42b1e297d3b1f + ab88cb6c272e236fd23401d6fae39520ad2ad735 - + https://github.com/dotnet/windowsdesktop - 0114276a943f6878c74e3315a1e42b1e297d3b1f + ab88cb6c272e236fd23401d6fae39520ad2ad735 - + https://github.com/dotnet/windowsdesktop - 0114276a943f6878c74e3315a1e42b1e297d3b1f + ab88cb6c272e236fd23401d6fae39520ad2ad735 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 6addd9b6386a762737e60e49c9fba18645d01510 - + https://github.com/dotnet/winforms - 062c02ed4cdceb5803bad0b66e7770987356b14c + e4dd68aa150eb063e4159dd1f3d1c2da2490e1ec - + https://github.com/dotnet/wpf - 54abd799f9419ae5a43c84e461a8aa3e8910fa3f + e77db53b88fb5ced52a3a5d223fd08d39515dd88 diff --git a/eng/Versions.props b/eng/Versions.props index 47b309746..d1c6d347e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20157.1 + 5.0.0-preview.3.20158.3 - 5.0.0-preview.3.20158.4 + 5.0.0-preview.3.20158.5 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20158.5 - 5.0.0-preview.3.20158.5 - 5.0.0-preview.3.20158.5 + 5.0.0-preview.3.20158.6 + 5.0.0-preview.3.20158.6 + 5.0.0-preview.3.20158.6 From 0572c1d128021e8c947e5841fb9501f520202365 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 16:06:14 +0000 Subject: [PATCH 15/98] [master] Update dependencies from dotnet/sdk (#6732) * Update dependencies from https://github.com/dotnet/sdk build 20200308.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20158.3 - Microsoft.NET.Sdk - 5.0.100-preview.2.20158.3 * Update dependencies from https://github.com/dotnet/sdk build 20200309.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20159.1 - Microsoft.NET.Sdk - 5.0.100-preview.2.20159.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a0986d49..87f44b335 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 6addd9b6386a762737e60e49c9fba18645d01510 + 5f8b546811757253e37a953dab22ce97174b210d - + https://github.com/dotnet/sdk - 6addd9b6386a762737e60e49c9fba18645d01510 + 5f8b546811757253e37a953dab22ce97174b210d diff --git a/eng/Versions.props b/eng/Versions.props index d1c6d347e..5604e4d8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20158.2 - 5.0.100-preview.2.20158.2 + 5.0.100-preview.2.20159.1 + 5.0.100-preview.2.20159.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a6a713119ced4b2da25497d7ed0a3f5e48831f4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Mar 2020 11:07:06 -0700 Subject: [PATCH 16/98] Update to preview 3 (#6714) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5604e4d8c..5b6ceb463 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview - 2 + 3 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From edbdf82041abff369ed64e5d0d6fd590e75b5328 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 18:46:20 +0000 Subject: [PATCH 17/98] Update dependencies from https://github.com/dotnet/sdk build 20200309.2 (#6735) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20159.2 - Microsoft.NET.Sdk - 5.0.100-preview.2.20159.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87f44b335..2f0d5433d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 5f8b546811757253e37a953dab22ce97174b210d + 9d7f619a73ed32e58fa26380882b72a862d3b3b5 - + https://github.com/dotnet/sdk - 5f8b546811757253e37a953dab22ce97174b210d + 9d7f619a73ed32e58fa26380882b72a862d3b3b5 diff --git a/eng/Versions.props b/eng/Versions.props index 5b6ceb463..88535042d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20159.1 - 5.0.100-preview.2.20159.1 + 5.0.100-preview.2.20159.2 + 5.0.100-preview.2.20159.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7321a05a356b24a0048176ae94780ba660996470 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (CLR)" Date: Mon, 9 Mar 2020 13:17:14 -0700 Subject: [PATCH 18/98] Update minimum supported OSX version to 10.13 --- src/redist/targets/packaging/osx/clisdk/Distribution-Template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template index 38d890a00..1383f20c4 100644 --- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template @@ -7,7 +7,7 @@ - + From 1e0ccaddc6424ff6e127031eb5a13b1db6b63230 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 09:32:21 +0000 Subject: [PATCH 19/98] [master] Update dependencies from dotnet/windowsdesktop (#6738) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200309.3 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20159.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20159.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20159.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20159.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20159.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200309.4 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20159.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20159.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20159.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20159.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20159.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20159.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20159.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f0d5433d..167745078 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - ab88cb6c272e236fd23401d6fae39520ad2ad735 + be34ffdb2decba38318323f84243d07460ba5f58 - + https://github.com/dotnet/windowsdesktop - ab88cb6c272e236fd23401d6fae39520ad2ad735 + be34ffdb2decba38318323f84243d07460ba5f58 - + https://github.com/dotnet/windowsdesktop - ab88cb6c272e236fd23401d6fae39520ad2ad735 + be34ffdb2decba38318323f84243d07460ba5f58 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 9d7f619a73ed32e58fa26380882b72a862d3b3b5 - + https://github.com/dotnet/winforms - e4dd68aa150eb063e4159dd1f3d1c2da2490e1ec + c3da51b903bbe2245a6f171940f24bc47bdf7c12 - + https://github.com/dotnet/wpf - e77db53b88fb5ced52a3a5d223fd08d39515dd88 + a99f192d42480963823ace3d91a3f5568ded1385 diff --git a/eng/Versions.props b/eng/Versions.props index 88535042d..0ae04b6f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20158.3 + 5.0.0-preview.3.20159.5 - 5.0.0-preview.3.20158.5 + 5.0.0-preview.3.20159.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20158.6 - 5.0.0-preview.3.20158.6 - 5.0.0-preview.3.20158.6 + 5.0.0-preview.3.20160.1 + 5.0.0-preview.3.20160.1 + 5.0.0-preview.3.20160.1 From 9d18c26ea2df167731caca6f9521bf797281fd47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 10:14:52 +0000 Subject: [PATCH 20/98] [master] Update dependencies from dotnet/sdk (#6746) * Update dependencies from https://github.com/dotnet/sdk build 20200309.4 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20159.4 - Microsoft.NET.Sdk - 5.0.100-preview.3.20159.4 * Update dependencies from https://github.com/dotnet/sdk build 20200310.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 167745078..321dbbcaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 9d7f619a73ed32e58fa26380882b72a862d3b3b5 + c91872ceec89057e744db509aa15b40f9508f681 - + https://github.com/dotnet/sdk - 9d7f619a73ed32e58fa26380882b72a862d3b3b5 + c91872ceec89057e744db509aa15b40f9508f681 diff --git a/eng/Versions.props b/eng/Versions.props index 0ae04b6f6..ee81c2127 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20159.2 - 5.0.100-preview.2.20159.2 + 5.0.100-preview.3.20160.1 + 5.0.100-preview.3.20160.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2134a867661cb44645db1a9982057e20a0883111 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 12:55:52 +0000 Subject: [PATCH 21/98] Update dependencies from https://github.com/dotnet/sdk build 20200310.2 (#6748) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 321dbbcaf..2caa2b174 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - c91872ceec89057e744db509aa15b40f9508f681 + 05cb0900f7f2aadadb7287d4a3bf3d8721e763e3 - + https://github.com/dotnet/sdk - c91872ceec89057e744db509aa15b40f9508f681 + 05cb0900f7f2aadadb7287d4a3bf3d8721e763e3 diff --git a/eng/Versions.props b/eng/Versions.props index ee81c2127..bba43b5a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.1 - 5.0.100-preview.3.20160.1 + 5.0.100-preview.3.20160.2 + 5.0.100-preview.3.20160.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3e1cf36dca339ed71c28afa2394ca2ce7771266b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 14:46:01 +0000 Subject: [PATCH 22/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.2 (#6749) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2caa2b174..f5b2be75c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - be34ffdb2decba38318323f84243d07460ba5f58 + a61e3ee7d83732269bb7f302871399b7d6d4de69 - + https://github.com/dotnet/windowsdesktop - be34ffdb2decba38318323f84243d07460ba5f58 + a61e3ee7d83732269bb7f302871399b7d6d4de69 - + https://github.com/dotnet/windowsdesktop - be34ffdb2decba38318323f84243d07460ba5f58 + a61e3ee7d83732269bb7f302871399b7d6d4de69 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bba43b5a6..d4edf012a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.1 - 5.0.0-preview.3.20160.1 - 5.0.0-preview.3.20160.1 + 5.0.0-preview.3.20160.2 + 5.0.0-preview.3.20160.2 + 5.0.0-preview.3.20160.2 From 32a657c64602dcf297002735228f0ab4f3069a01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 16:31:06 +0000 Subject: [PATCH 23/98] Update dependencies from https://github.com/dotnet/sdk build 20200310.4 (#6751) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.4 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5b2be75c..d9e82c118 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 05cb0900f7f2aadadb7287d4a3bf3d8721e763e3 + 450ef043597c37b4833fb47c46561b0f109cc19b - + https://github.com/dotnet/sdk - 05cb0900f7f2aadadb7287d4a3bf3d8721e763e3 + 450ef043597c37b4833fb47c46561b0f109cc19b diff --git a/eng/Versions.props b/eng/Versions.props index d4edf012a..9668ded7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.2 - 5.0.100-preview.3.20160.2 + 5.0.100-preview.3.20160.4 + 5.0.100-preview.3.20160.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7cb9ffef63b7959081e7ad69271786433030b793 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:00:58 +0000 Subject: [PATCH 24/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.3 (#6752) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20160.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9e82c118..cff4666bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - a61e3ee7d83732269bb7f302871399b7d6d4de69 + aa20a7198f73854df5b88c37ffa10a12b55d7b71 - + https://github.com/dotnet/windowsdesktop - a61e3ee7d83732269bb7f302871399b7d6d4de69 + aa20a7198f73854df5b88c37ffa10a12b55d7b71 - + https://github.com/dotnet/windowsdesktop - a61e3ee7d83732269bb7f302871399b7d6d4de69 + aa20a7198f73854df5b88c37ffa10a12b55d7b71 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms c3da51b903bbe2245a6f171940f24bc47bdf7c12 - + https://github.com/dotnet/wpf - a99f192d42480963823ace3d91a3f5568ded1385 + dcbe6ad365a2dc09c201491591549dc3594af1b7 diff --git a/eng/Versions.props b/eng/Versions.props index 9668ded7a..e1dd39edc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20159.4 + 5.0.0-preview.3.20160.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.2 - 5.0.0-preview.3.20160.2 - 5.0.0-preview.3.20160.2 + 5.0.0-preview.3.20160.3 + 5.0.0-preview.3.20160.3 + 5.0.0-preview.3.20160.3 From 6e2629f48eb5b47aad496f04b6e7958d4d9096c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 18:10:57 +0000 Subject: [PATCH 25/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.4 (#6754) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20160.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20160.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cff4666bb..783131534 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - aa20a7198f73854df5b88c37ffa10a12b55d7b71 + 7aafc9bba6521a60973e43672a4e4cd121bba1be - + https://github.com/dotnet/windowsdesktop - aa20a7198f73854df5b88c37ffa10a12b55d7b71 + 7aafc9bba6521a60973e43672a4e4cd121bba1be - + https://github.com/dotnet/windowsdesktop - aa20a7198f73854df5b88c37ffa10a12b55d7b71 + 7aafc9bba6521a60973e43672a4e4cd121bba1be https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 450ef043597c37b4833fb47c46561b0f109cc19b - + https://github.com/dotnet/winforms - c3da51b903bbe2245a6f171940f24bc47bdf7c12 + 4ac79a93f385b189ffbec42fc73329b5acbb52f1 - + https://github.com/dotnet/wpf - dcbe6ad365a2dc09c201491591549dc3594af1b7 + 52d2670dc033ca5495a9cedaaaf31730b50ddcbc diff --git a/eng/Versions.props b/eng/Versions.props index e1dd39edc..90cbe5d1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20159.5 + 5.0.0-preview.3.20160.1 - 5.0.0-preview.3.20160.1 + 5.0.0-preview.3.20160.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.3 - 5.0.0-preview.3.20160.3 - 5.0.0-preview.3.20160.3 + 5.0.0-preview.3.20160.4 + 5.0.0-preview.3.20160.4 + 5.0.0-preview.3.20160.4 From 15c99adf91ba1a716767ce744e25a7b4db17c60c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 18:51:04 +0000 Subject: [PATCH 26/98] Update dependencies from https://github.com/dotnet/sdk build 20200310.5 (#6755) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783131534..f1e9859dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 450ef043597c37b4833fb47c46561b0f109cc19b + 1454d9d92e84369fad605ad01cca15a40d3dbdc8 - + https://github.com/dotnet/sdk - 450ef043597c37b4833fb47c46561b0f109cc19b + 1454d9d92e84369fad605ad01cca15a40d3dbdc8 diff --git a/eng/Versions.props b/eng/Versions.props index 90cbe5d1e..3d4ab84b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.4 - 5.0.100-preview.3.20160.4 + 5.0.100-preview.3.20160.5 + 5.0.100-preview.3.20160.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c431820759e3e2c6085f3d29aa0eb690b74a7270 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 20:51:03 +0000 Subject: [PATCH 27/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.5 (#6756) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.5 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.5 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20160.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1e9859dd..d3051ea65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 7aafc9bba6521a60973e43672a4e4cd121bba1be + 1f23124e4433e631c41eb7f8b745c412db48a131 - + https://github.com/dotnet/windowsdesktop - 7aafc9bba6521a60973e43672a4e4cd121bba1be + 1f23124e4433e631c41eb7f8b745c412db48a131 - + https://github.com/dotnet/windowsdesktop - 7aafc9bba6521a60973e43672a4e4cd121bba1be + 1f23124e4433e631c41eb7f8b745c412db48a131 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 4ac79a93f385b189ffbec42fc73329b5acbb52f1 - + https://github.com/dotnet/wpf - 52d2670dc033ca5495a9cedaaaf31730b50ddcbc + 440d790bdfb55a18ce9a2cd1155e20aa15172095 diff --git a/eng/Versions.props b/eng/Versions.props index 3d4ab84b7..c9f1cabe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20160.2 + 5.0.0-preview.3.20160.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.4 - 5.0.0-preview.3.20160.4 - 5.0.0-preview.3.20160.4 + 5.0.0-preview.3.20160.5 + 5.0.0-preview.3.20160.5 + 5.0.0-preview.3.20160.5 From a116809282689eaf2e78d428c5a9b9a9cd423e4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 23:14:11 +0000 Subject: [PATCH 28/98] Update dependencies from https://github.com/dotnet/arcade build 20200308.2 (#6734) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20158.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3051ea65..40a0f970d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - ca67e6af5b3c6d94755f0912c5365bea44130b12 + 527179abfbb5cd738035c4ac2d2566c571ce85db diff --git a/global.json b/global.json index 2b634f734..4e9bd390c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20157.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20158.2" } } From fdfa7d554a5873f676a6f65589ffd7024cfc2aeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 23:55:55 +0000 Subject: [PATCH 29/98] Update dependencies from https://github.com/dotnet/sdk build 20200310.10 (#6759) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.10 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.10 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40a0f970d..54d09c73c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 1454d9d92e84369fad605ad01cca15a40d3dbdc8 + 45a458819a5374dab81e4b31c3158e1a8adbc882 - + https://github.com/dotnet/sdk - 1454d9d92e84369fad605ad01cca15a40d3dbdc8 + 45a458819a5374dab81e4b31c3158e1a8adbc882 diff --git a/eng/Versions.props b/eng/Versions.props index c9f1cabe3..1f173202f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.5 - 5.0.100-preview.3.20160.5 + 5.0.100-preview.3.20160.10 + 5.0.100-preview.3.20160.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a393da9dba7b94af86906998ff8c6bce256eb559 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 01:40:59 +0000 Subject: [PATCH 30/98] Update dependencies from https://github.com/dotnet/sdk build 20200310.12 (#6762) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20160.12 - Microsoft.NET.Sdk - 5.0.100-preview.3.20160.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d09c73c..78c3fddf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 45a458819a5374dab81e4b31c3158e1a8adbc882 + cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/sdk - 45a458819a5374dab81e4b31c3158e1a8adbc882 + cda04f124e3571e186ecc8f26958ceeaffb2a469 diff --git a/eng/Versions.props b/eng/Versions.props index 1f173202f..aa5851191 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.10 - 5.0.100-preview.3.20160.10 + 5.0.100-preview.3.20160.12 + 5.0.100-preview.3.20160.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51f3bc6a1791a9187fa1338f3530f7b065e6ea7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 06:31:00 +0000 Subject: [PATCH 31/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.7 (#6766) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.7 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.7 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.7 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20160.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20160.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78c3fddf7..ed74e2f80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 1f23124e4433e631c41eb7f8b745c412db48a131 + 7fae48ac9f707ab90d8f92278c4220112ff61d06 - + https://github.com/dotnet/windowsdesktop - 1f23124e4433e631c41eb7f8b745c412db48a131 + 7fae48ac9f707ab90d8f92278c4220112ff61d06 - + https://github.com/dotnet/windowsdesktop - 1f23124e4433e631c41eb7f8b745c412db48a131 + 7fae48ac9f707ab90d8f92278c4220112ff61d06 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 4ac79a93f385b189ffbec42fc73329b5acbb52f1 + 0d04c5a5d8ea650ffdbf581ca119ba459e2137ec - + https://github.com/dotnet/wpf - 440d790bdfb55a18ce9a2cd1155e20aa15172095 + 65320b3cd3a074d31c62ea0817e8db79017564e5 diff --git a/eng/Versions.props b/eng/Versions.props index aa5851191..b683d0fd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20160.1 + 5.0.0-preview.3.20160.2 - 5.0.0-preview.3.20160.4 + 5.0.0-preview.3.20160.5 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.5 - 5.0.0-preview.3.20160.5 - 5.0.0-preview.3.20160.5 + 5.0.0-preview.3.20160.7 + 5.0.0-preview.3.20160.7 + 5.0.0-preview.3.20160.7 From f13d4cc16e62266cc177a561d939e7bdca442a0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:11:03 +0000 Subject: [PATCH 32/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.8 (#6768) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20160.8 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20160.8 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20160.8 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20160.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20160.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed74e2f80..44ca11191 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 7fae48ac9f707ab90d8f92278c4220112ff61d06 + 58f3842510bbbcca6193d94dacb92dedcee92c68 - + https://github.com/dotnet/windowsdesktop - 7fae48ac9f707ab90d8f92278c4220112ff61d06 + 58f3842510bbbcca6193d94dacb92dedcee92c68 - + https://github.com/dotnet/windowsdesktop - 7fae48ac9f707ab90d8f92278c4220112ff61d06 + 58f3842510bbbcca6193d94dacb92dedcee92c68 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 0d04c5a5d8ea650ffdbf581ca119ba459e2137ec + 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - 65320b3cd3a074d31c62ea0817e8db79017564e5 + 9fc9a31b407870d01c128c7802aa8b15e7c9cb56 diff --git a/eng/Versions.props b/eng/Versions.props index b683d0fd2..9af8f969e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20160.2 + 5.0.0-preview.3.20160.3 - 5.0.0-preview.3.20160.5 + 5.0.0-preview.3.20160.6 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.7 - 5.0.0-preview.3.20160.7 - 5.0.0-preview.3.20160.7 + 5.0.0-preview.3.20160.8 + 5.0.0-preview.3.20160.8 + 5.0.0-preview.3.20160.8 From bf814b3ad05faaa50a58a87eb5672ebc10b55aa4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 12:30:02 +0000 Subject: [PATCH 33/98] Update dependencies from https://github.com/dotnet/arcade build 20200310.4 (#6770) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20160.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44ca11191..7ab6ef417 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 527179abfbb5cd738035c4ac2d2566c571ce85db + 9a9422d109520d942711e07fae8c662c20e7b6e9 diff --git a/global.json b/global.json index 4e9bd390c..8cdda9ca9 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20158.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20160.4" } } From dfe6198dc56e8502101fb45677033bbe0d6fbef7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 14:36:06 +0000 Subject: [PATCH 34/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200311.1 (#6771) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20161.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20161.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20161.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ab6ef417..29e9e2809 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 58f3842510bbbcca6193d94dacb92dedcee92c68 + cee947c4d6cccad727cdea3b1017b9ab2866ba65 - + https://github.com/dotnet/windowsdesktop - 58f3842510bbbcca6193d94dacb92dedcee92c68 + cee947c4d6cccad727cdea3b1017b9ab2866ba65 - + https://github.com/dotnet/windowsdesktop - 58f3842510bbbcca6193d94dacb92dedcee92c68 + cee947c4d6cccad727cdea3b1017b9ab2866ba65 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9af8f969e..6f5649be9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20160.8 - 5.0.0-preview.3.20160.8 - 5.0.0-preview.3.20160.8 + 5.0.0-preview.3.20161.1 + 5.0.0-preview.3.20161.1 + 5.0.0-preview.3.20161.1 From a722af7d732655c8038212d1553c24be3dd89e73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 16:37:51 +0000 Subject: [PATCH 35/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200311.2 (#6772) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20161.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20161.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20161.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20161.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29e9e2809..07123de00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - cee947c4d6cccad727cdea3b1017b9ab2866ba65 + 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad - + https://github.com/dotnet/windowsdesktop - cee947c4d6cccad727cdea3b1017b9ab2866ba65 + 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad - + https://github.com/dotnet/windowsdesktop - cee947c4d6cccad727cdea3b1017b9ab2866ba65 + 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - 9fc9a31b407870d01c128c7802aa8b15e7c9cb56 + 8ffd1d57d010cb560fac558e779a385ee59b0266 diff --git a/eng/Versions.props b/eng/Versions.props index 6f5649be9..d636496d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20160.6 + 5.0.0-preview.3.20161.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20161.1 - 5.0.0-preview.3.20161.1 - 5.0.0-preview.3.20161.1 + 5.0.0-preview.3.20161.2 + 5.0.0-preview.3.20161.2 + 5.0.0-preview.3.20161.2 From 201ed13352e2310631a0e02341403116fb111f52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 17:51:04 +0000 Subject: [PATCH 36/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200311.3 (#6773) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20161.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20161.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20161.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20161.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07123de00..bb8ff6fe3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad + 547648657cef62c4e4740749afb5f907aa51a6d9 - + https://github.com/dotnet/windowsdesktop - 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad + 547648657cef62c4e4740749afb5f907aa51a6d9 - + https://github.com/dotnet/windowsdesktop - 45ee035489aa259a95c70ccf7fbfb31e9a6c12ad + 547648657cef62c4e4740749afb5f907aa51a6d9 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - 8ffd1d57d010cb560fac558e779a385ee59b0266 + 7c6f8ae291b1e78a3681ec5b832a4116d44880c3 diff --git a/eng/Versions.props b/eng/Versions.props index d636496d0..bcb3a64ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20161.1 + 5.0.0-preview.3.20161.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20161.2 - 5.0.0-preview.3.20161.2 - 5.0.0-preview.3.20161.2 + 5.0.0-preview.3.20161.3 + 5.0.0-preview.3.20161.3 + 5.0.0-preview.3.20161.3 From e87acd73ac24f6ea80ae0d4c0e42bc8f5e3ce1cc Mon Sep 17 00:00:00 2001 From: Brian Robbins Date: Wed, 11 Mar 2020 17:38:41 -0700 Subject: [PATCH 37/98] Disable partial NGEN. --- src/core-sdk-tasks/Crossgen.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core-sdk-tasks/Crossgen.cs b/src/core-sdk-tasks/Crossgen.cs index 4587b3ca2..82c8c9160 100644 --- a/src/core-sdk-tasks/Crossgen.cs +++ b/src/core-sdk-tasks/Crossgen.cs @@ -13,6 +13,13 @@ namespace Microsoft.DotNet.Build.Tasks { public sealed class Crossgen : ToolTask { + public Crossgen() + { + // Disable partial NGEN to avoid excess JIT-compilation. + // The intention is to pre-compile as much as possible. + EnvironmentVariables = new string[] { "COMPlus_PartialNGen=0" }; + } + [Required] public string SourceAssembly { get;set; } From 0ae80a947b464de865b5ea87ecf2acb7b28b5a79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 12:35:56 +0000 Subject: [PATCH 38/98] Update dependencies from https://github.com/dotnet/arcade build 20200311.5 (#6782) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20161.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb8ff6fe3..e1dc22e36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 9a9422d109520d942711e07fae8c662c20e7b6e9 + df7ef03819d65500711edd0bceac091264b464b1 diff --git a/global.json b/global.json index 8cdda9ca9..a7eb7bbe4 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20160.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20161.5" } } From 75809d012cdf6d16cfbbd71d4bef463206c53636 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 14:30:58 +0000 Subject: [PATCH 39/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200312.1 (#6784) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20162.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20162.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20162.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20161.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1dc22e36..3fa942b7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 547648657cef62c4e4740749afb5f907aa51a6d9 + 46d29189dc16c5d1793ba67ea009a83e1cbaa39b - + https://github.com/dotnet/windowsdesktop - 547648657cef62c4e4740749afb5f907aa51a6d9 + 46d29189dc16c5d1793ba67ea009a83e1cbaa39b - + https://github.com/dotnet/windowsdesktop - 547648657cef62c4e4740749afb5f907aa51a6d9 + 46d29189dc16c5d1793ba67ea009a83e1cbaa39b https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - 7c6f8ae291b1e78a3681ec5b832a4116d44880c3 + e1ec12d0b1a9dc207aeeb099b97ba53c9ee1a6de diff --git a/eng/Versions.props b/eng/Versions.props index bcb3a64ae..5ae914258 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20161.2 + 5.0.0-preview.3.20161.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20161.3 - 5.0.0-preview.3.20161.3 - 5.0.0-preview.3.20161.3 + 5.0.0-preview.3.20162.1 + 5.0.0-preview.3.20162.1 + 5.0.0-preview.3.20162.1 From cdc2f708171461d981cc291234defb19ad27758b Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 12 Mar 2020 09:59:43 -0700 Subject: [PATCH 40/98] Adding 3.1.3xx builds to readme matrix --- README.md | 86 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 827e89420..fe3cee80e 100644 --- a/README.md +++ b/README.md @@ -49,19 +49,19 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( ``` -| Platform | Master
(5.0.x Runtime) | 5.0.100 Preview 1
(5.0 Runtime) | Release/3.1.2XX
(3.1.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/3.0.1xx
(3.0.x Runtime) | -| :--------- | :----------: | :----------: | :----------: | :----------: | :----------: | -| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-5.0.1XX-preview1]][win-x64-version-5.0.1XX-preview1]
[Installer][win-x64-installer-5.0.1XX-preview1] - [Checksum][win-x64-installer-checksum-5.0.1XX-preview1]
[zip][win-x64-zip-5.0.1XX-preview1] - [Checksum][win-x64-zip-checksum-5.0.1XX-preview1] | [![][win-x64-badge-3.1.2XX]][win-x64-version-3.1.2XX]
[Installer][win-x64-installer-3.1.2XX] - [Checksum][win-x64-installer-checksum-3.1.2XX]
[zip][win-x64-zip-3.1.2XX] - [Checksum][win-x64-zip-checksum-3.1.2XX] | [![][win-x64-badge-3.1.1XX]][win-x64-version-3.1.1XX]
[Installer][win-x64-installer-3.1.1XX] - [Checksum][win-x64-installer-checksum-3.1.1XX]
[zip][win-x64-zip-3.1.1XX] - [Checksum][win-x64-zip-checksum-3.1.1XX] | [![][win-x64-badge-3.0.1XX]][win-x64-version-3.0.1XX]
[Installer][win-x64-installer-3.0.1XX] - [Checksum][win-x64-installer-checksum-3.0.1XX]
[zip][win-x64-zip-3.0.1XX] - [Checksum][win-x64-zip-checksum-3.0.1XX] | -| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-5.0.1XX-preview1]][win-x86-version-5.0.1XX-preview1]
[Installer][win-x86-installer-5.0.1XX-preview1] - [Checksum][win-x86-installer-checksum-5.0.1XX-preview1]
[zip][win-x86-zip-5.0.1XX-preview1] - [Checksum][win-x86-zip-checksum-5.0.1XX-preview1] | [![][win-x86-badge-3.1.2XX]][win-x86-version-3.1.2XX]
[Installer][win-x86-installer-3.1.2XX] - [Checksum][win-x86-installer-checksum-3.1.2XX]
[zip][win-x86-zip-3.1.2XX] - [Checksum][win-x86-zip-checksum-3.1.2XX] | [![][win-x86-badge-3.1.1XX]][win-x86-version-3.1.1XX]
[Installer][win-x86-installer-3.1.1XX] - [Checksum][win-x86-installer-checksum-3.1.1XX]
[zip][win-x86-zip-3.1.1XX] - [Checksum][win-x86-zip-checksum-3.1.1XX] | [![][win-x86-badge-3.0.1XX]][win-x86-version-3.0.1XX]
[Installer][win-x86-installer-3.0.1XX] - [Checksum][win-x86-installer-checksum-3.0.1XX]
[zip][win-x86-zip-3.0.1XX] - [Checksum][win-x86-zip-checksum-3.0.1XX] | -| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-5.0.1XX-preview1]][osx-version-5.0.1XX-preview1]
[Installer][osx-installer-5.0.1XX-preview1] - [Checksum][osx-installer-checksum-5.0.1XX-preview1]
[tar.gz][osx-targz-5.0.1XX-preview1] - [Checksum][osx-targz-checksum-5.0.1XX-preview1] | [![][osx-badge-3.1.2XX]][osx-version-3.1.2XX]
[Installer][osx-installer-3.1.2XX] - [Checksum][osx-installer-checksum-3.1.2XX]
[tar.gz][osx-targz-3.1.2XX] - [Checksum][osx-targz-checksum-3.1.2XX] | [![][osx-badge-3.1.1XX]][osx-version-3.1.1XX]
[Installer][osx-installer-3.1.1XX] - [Checksum][osx-installer-checksum-3.1.1XX]
[tar.gz][osx-targz-3.1.1XX] - [Checksum][osx-targz-checksum-3.1.1XX] | [![][osx-badge-3.0.1XX]][osx-version-3.0.1XX]
[Installer][osx-installer-3.0.1XX] - [Checksum][osx-installer-checksum-3.0.1XX]
[tar.gz][osx-targz-3.0.1XX] - [Checksum][osx-targz-checksum-3.0.1XX] | -| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-5.0.1XX-preview1]][linux-version-5.0.1XX-preview1]
[DEB Installer][linux-DEB-installer-5.0.1XX-preview1] - [Checksum][linux-DEB-installer-checksum-5.0.1XX-preview1]
[RPM Installer][linux-RPM-installer-5.0.1XX-preview1] - [Checksum][linux-RPM-installer-checksum-5.0.1XX-preview1]
_see installer note below_1
[tar.gz][linux-targz-5.0.1XX-preview1] - [Checksum][linux-targz-checksum-5.0.1XX-preview1] | [![][linux-badge-3.1.2XX]][linux-version-3.1.2XX]
[DEB Installer][linux-DEB-installer-3.1.2XX] - [Checksum][linux-DEB-installer-checksum-3.1.2XX]
[RPM Installer][linux-RPM-installer-3.1.2XX] - [Checksum][linux-RPM-installer-checksum-3.1.2XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.2XX] - [Checksum][linux-targz-checksum-3.1.2XX] | [![][linux-badge-3.1.1XX]][linux-version-3.1.1XX]
[DEB Installer][linux-DEB-installer-3.1.1XX] - [Checksum][linux-DEB-installer-checksum-3.1.1XX]
[RPM Installer][linux-RPM-installer-3.1.1XX] - [Checksum][linux-RPM-installer-checksum-3.1.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.1XX] - [Checksum][linux-targz-checksum-3.1.1XX] | [![][linux-badge-3.0.1XX]][linux-version-3.0.1XX]
[DEB Installer][linux-DEB-installer-3.0.1XX] - [Checksum][linux-DEB-installer-checksum-3.0.1XX]
[RPM Installer][linux-RPM-installer-3.0.1XX] - [Checksum][linux-RPM-installer-checksum-3.0.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.0.1XX] - [Checksum][linux-targz-checksum-3.0.1XX] | -| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-5.0.1XX-preview1]][linux-arm-version-5.0.1XX-preview1]
[tar.gz][linux-arm-targz-5.0.1XX-preview1] - [Checksum][linux-arm-targz-checksum-5.0.1XX-preview1] | [![][linux-arm-badge-3.1.2XX]][linux-arm-version-3.1.2XX]
[tar.gz][linux-arm-targz-3.1.2XX] - [Checksum][linux-arm-targz-checksum-3.1.2XX] | [![][linux-arm-badge-3.1.1XX]][linux-arm-version-3.1.1XX]
[tar.gz][linux-arm-targz-3.1.1XX] - [Checksum][linux-arm-targz-checksum-3.1.1XX] | [![][linux-arm-badge-3.0.1XX]][linux-arm-version-3.0.1XX]
[tar.gz][linux-arm-targz-3.0.1XX] - [Checksum][linux-arm-targz-checksum-3.0.1XX] | -| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.1XX-preview1]][linux-arm64-version-5.0.1XX-preview1]
[tar.gz][linux-arm64-targz-5.0.1XX-preview1] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-preview1] | [![][linux-arm64-badge-3.1.2XX]][linux-arm64-version-3.1.2XX]
[tar.gz][linux-arm64-targz-3.1.2XX] - [Checksum][linux-arm64-targz-checksum-3.1.2XX] | [![][linux-arm64-badge-3.1.1XX]][linux-arm64-version-3.1.1XX]
[tar.gz][linux-arm64-targz-3.1.1XX] - [Checksum][linux-arm64-targz-checksum-3.1.1XX] | [![][linux-arm64-badge-3.0.1XX]][linux-arm64-version-3.0.1XX]
[tar.gz][linux-arm64-targz-3.0.1XX] - [Checksum][linux-arm64-targz-checksum-3.0.1XX] | -| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-5.0.1XX-preview1]][rhel-6-version-5.0.1XX-preview1]
[tar.gz][rhel-6-targz-5.0.1XX-preview1] - [Checksum][rhel-6-targz-checksum-5.0.1XX-preview1] | [![][rhel-6-badge-3.1.2XX]][rhel-6-version-3.1.2XX]
[tar.gz][rhel-6-targz-3.1.2XX] - [Checksum][rhel-6-targz-checksum-3.1.2XX] | [![][rhel-6-badge-3.1.1XX]][rhel-6-version-3.1.1XX]
[tar.gz][rhel-6-targz-3.1.1XX] - [Checksum][rhel-6-targz-checksum-3.1.1XX] | [![][rhel-6-badge-3.0.1XX]][rhel-6-version-3.0.1XX]
[tar.gz][rhel-6-targz-3.0.1XX] - [Checksum][rhel-6-targz-checksum-3.0.1XX] | -| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-5.0.1XX-preview1]][linux-musl-version-5.0.1XX-preview1]
[tar.gz][linux-musl-targz-5.0.1XX-preview1] - [Checksum][linux-musl-targz-checksum-5.0.1XX-preview1] | [![][linux-musl-badge-3.1.2XX]][linux-musl-version-3.1.2XX]
[tar.gz][linux-musl-targz-3.1.2XX] - [Checksum][linux-musl-targz-checksum-3.1.2XX] | [![][linux-musl-badge-3.1.1XX]][linux-musl-version-3.1.1XX]
[tar.gz][linux-musl-targz-3.1.1XX] - [Checksum][linux-musl-targz-checksum-3.1.1XX] | [![][linux-musl-badge-3.0.1XX]][linux-musl-version-3.0.1XX]
[tar.gz][linux-musl-targz-3.0.1XX] - [Checksum][linux-musl-targz-checksum-3.0.1XX] | -| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | **N/A** | [![][win-arm-badge-3.1.2XX]][win-arm-version-3.1.2XX]
[zip][win-arm-zip-3.1.2XX] - [Checksum][win-arm-zip-checksum-3.1.2XX] | [![][win-arm-badge-3.1.1XX]][win-arm-version-3.1.1XX]
[zip][win-arm-zip-3.1.1XX] - [Checksum][win-arm-zip-checksum-3.1.1XX] | [![][win-arm-badge-3.0.1XX]][win-arm-version-3.0.1XX]
[zip][win-arm-zip-3.0.1XX] - [Checksum][win-arm-zip-checksum-3.0.1XX] | -| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | **N/A** | [![][freebsd-x64-badge-3.1.2XX]][freebsd-x64-version-3.1.2XX]
[tar.gz][freebsd-x64-zip-3.1.2XX] - [Checksum][freebsd-x64-zip-checksum-3.1.2XX] | [![][freebsd-x64-badge-3.1.1XX]][freebsd-x64-version-3.1.1XX]
[tar.gz][freebsd-x64-zip-3.1.1XX] - [Checksum][freebsd-x64-zip-checksum-3.1.1XX] | [![][freebsd-x64-badge-3.0.1XX]][freebsd-x64-version-3.0.1XX]
[tar.gz][freebsd-x64-zip-3.0.1XX] - [Checksum][freebsd-x64-zip-checksum-3.0.1XX] | -| **Constituent Repo Shas** | **N/A** | **N/A** | **N/A** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | +| Platform | Master
(5.0.x Runtime) | 5.0.100 Preview 1
(5.0 Runtime) | Release/3.1.3XX
(3.1.x Runtime) | Release/3.1.2XX
(3.1.x Runtime) | Release/3.1.1XX
(3.1.x Runtime) | Release/3.0.1xx
(3.0.x Runtime) | +| :--------- | :----------: | :----------: | :----------: | :----------: | :----------: | :----------: | +| **Windows x64** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master] - [Checksum][win-x64-installer-checksum-master]
[zip][win-x64-zip-master] - [Checksum][win-x64-zip-checksum-master] | [![][win-x64-badge-5.0.1XX-preview1]][win-x64-version-5.0.1XX-preview1]
[Installer][win-x64-installer-5.0.1XX-preview1] - [Checksum][win-x64-installer-checksum-5.0.1XX-preview1]
[zip][win-x64-zip-5.0.1XX-preview1] - [Checksum][win-x64-zip-checksum-5.0.1XX-preview1] | [![][win-x64-badge-3.1.3XX]][win-x64-version-3.1.3XX]
[Installer][win-x64-installer-3.1.3XX] - [Checksum][win-x64-installer-checksum-3.1.3XX]
[zip][win-x64-zip-3.1.3XX] - [Checksum][win-x64-zip-checksum-3.1.3XX] | [![][win-x64-badge-3.1.2XX]][win-x64-version-3.1.2XX]
[Installer][win-x64-installer-3.1.2XX] - [Checksum][win-x64-installer-checksum-3.1.2XX]
[zip][win-x64-zip-3.1.2XX] - [Checksum][win-x64-zip-checksum-3.1.2XX] | [![][win-x64-badge-3.1.1XX]][win-x64-version-3.1.1XX]
[Installer][win-x64-installer-3.1.1XX] - [Checksum][win-x64-installer-checksum-3.1.1XX]
[zip][win-x64-zip-3.1.1XX] - [Checksum][win-x64-zip-checksum-3.1.1XX] | [![][win-x64-badge-3.0.1XX]][win-x64-version-3.0.1XX]
[Installer][win-x64-installer-3.0.1XX] - [Checksum][win-x64-installer-checksum-3.0.1XX]
[zip][win-x64-zip-3.0.1XX] - [Checksum][win-x64-zip-checksum-3.0.1XX] | +| **Windows x86** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master] - [Checksum][win-x86-installer-checksum-master]
[zip][win-x86-zip-master] - [Checksum][win-x86-zip-checksum-master] | [![][win-x86-badge-5.0.1XX-preview1]][win-x86-version-5.0.1XX-preview1]
[Installer][win-x86-installer-5.0.1XX-preview1] - [Checksum][win-x86-installer-checksum-5.0.1XX-preview1]
[zip][win-x86-zip-5.0.1XX-preview1] - [Checksum][win-x86-zip-checksum-5.0.1XX-preview1] | [![][win-x86-badge-3.1.3XX]][win-x86-version-3.1.3XX]
[Installer][win-x86-installer-3.1.3XX] - [Checksum][win-x86-installer-checksum-3.1.3XX]
[zip][win-x86-zip-3.1.3XX] - [Checksum][win-x86-zip-checksum-3.1.3XX] | [![][win-x86-badge-3.1.2XX]][win-x86-version-3.1.2XX]
[Installer][win-x86-installer-3.1.2XX] - [Checksum][win-x86-installer-checksum-3.1.2XX]
[zip][win-x86-zip-3.1.2XX] - [Checksum][win-x86-zip-checksum-3.1.2XX] | [![][win-x86-badge-3.1.1XX]][win-x86-version-3.1.1XX]
[Installer][win-x86-installer-3.1.1XX] - [Checksum][win-x86-installer-checksum-3.1.1XX]
[zip][win-x86-zip-3.1.1XX] - [Checksum][win-x86-zip-checksum-3.1.1XX] | [![][win-x86-badge-3.0.1XX]][win-x86-version-3.0.1XX]
[Installer][win-x86-installer-3.0.1XX] - [Checksum][win-x86-installer-checksum-3.0.1XX]
[zip][win-x86-zip-3.0.1XX] - [Checksum][win-x86-zip-checksum-3.0.1XX] | +| **macOS** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master] - [Checksum][osx-installer-checksum-master]
[tar.gz][osx-targz-master] - [Checksum][osx-targz-checksum-master] | [![][osx-badge-5.0.1XX-preview1]][osx-version-5.0.1XX-preview1]
[Installer][osx-installer-5.0.1XX-preview1] - [Checksum][osx-installer-checksum-5.0.1XX-preview1]
[tar.gz][osx-targz-5.0.1XX-preview1] - [Checksum][osx-targz-checksum-5.0.1XX-preview1] | [![][osx-badge-3.1.3XX]][osx-version-3.1.3XX]
[Installer][osx-installer-3.1.3XX] - [Checksum][osx-installer-checksum-3.1.3XX]
[tar.gz][osx-targz-3.1.3XX] - [Checksum][osx-targz-checksum-3.1.3XX] | [![][osx-badge-3.1.2XX]][osx-version-3.1.2XX]
[Installer][osx-installer-3.1.2XX] - [Checksum][osx-installer-checksum-3.1.2XX]
[tar.gz][osx-targz-3.1.2XX] - [Checksum][osx-targz-checksum-3.1.2XX] | [![][osx-badge-3.1.1XX]][osx-version-3.1.1XX]
[Installer][osx-installer-3.1.1XX] - [Checksum][osx-installer-checksum-3.1.1XX]
[tar.gz][osx-targz-3.1.1XX] - [Checksum][osx-targz-checksum-3.1.1XX] | [![][osx-badge-3.0.1XX]][osx-version-3.0.1XX]
[Installer][osx-installer-3.0.1XX] - [Checksum][osx-installer-checksum-3.0.1XX]
[tar.gz][osx-targz-3.0.1XX] - [Checksum][osx-targz-checksum-3.0.1XX] | +| **Linux x64** | [![][linux-badge-master]][linux-version-master]
[DEB Installer][linux-DEB-installer-master] - [Checksum][linux-DEB-installer-checksum-master]
[RPM Installer][linux-RPM-installer-master] - [Checksum][linux-RPM-installer-checksum-master]
_see installer note below_1
[tar.gz][linux-targz-master] - [Checksum][linux-targz-checksum-master] | [![][linux-badge-5.0.1XX-preview1]][linux-version-5.0.1XX-preview1]
[DEB Installer][linux-DEB-installer-5.0.1XX-preview1] - [Checksum][linux-DEB-installer-checksum-5.0.1XX-preview1]
[RPM Installer][linux-RPM-installer-5.0.1XX-preview1] - [Checksum][linux-RPM-installer-checksum-5.0.1XX-preview1]
_see installer note below_1
[tar.gz][linux-targz-5.0.1XX-preview1] - [Checksum][linux-targz-checksum-5.0.1XX-preview1] | [![][linux-badge-3.1.3XX]][linux-version-3.1.3XX]
[DEB Installer][linux-DEB-installer-3.1.3XX] - [Checksum][linux-DEB-installer-checksum-3.1.3XX]
[RPM Installer][linux-RPM-installer-3.1.3XX] - [Checksum][linux-RPM-installer-checksum-3.1.3XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.3XX] - [Checksum][linux-targz-checksum-3.1.3XX] | [![][linux-badge-3.1.2XX]][linux-version-3.1.2XX]
[DEB Installer][linux-DEB-installer-3.1.2XX] - [Checksum][linux-DEB-installer-checksum-3.1.2XX]
[RPM Installer][linux-RPM-installer-3.1.2XX] - [Checksum][linux-RPM-installer-checksum-3.1.2XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.2XX] - [Checksum][linux-targz-checksum-3.1.2XX] | [![][linux-badge-3.1.1XX]][linux-version-3.1.1XX]
[DEB Installer][linux-DEB-installer-3.1.1XX] - [Checksum][linux-DEB-installer-checksum-3.1.1XX]
[RPM Installer][linux-RPM-installer-3.1.1XX] - [Checksum][linux-RPM-installer-checksum-3.1.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.1.1XX] - [Checksum][linux-targz-checksum-3.1.1XX] | [![][linux-badge-3.0.1XX]][linux-version-3.0.1XX]
[DEB Installer][linux-DEB-installer-3.0.1XX] - [Checksum][linux-DEB-installer-checksum-3.0.1XX]
[RPM Installer][linux-RPM-installer-3.0.1XX] - [Checksum][linux-RPM-installer-checksum-3.0.1XX]
_see installer note below_1
[tar.gz][linux-targz-3.0.1XX] - [Checksum][linux-targz-checksum-3.0.1XX] | +| **Linux arm** | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master] - [Checksum][linux-arm-targz-checksum-master] | [![][linux-arm-badge-5.0.1XX-preview1]][linux-arm-version-5.0.1XX-preview1]
[tar.gz][linux-arm-targz-5.0.1XX-preview1] - [Checksum][linux-arm-targz-checksum-5.0.1XX-preview1] | [![][linux-arm-badge-3.1.3XX]][linux-arm-version-3.1.3XX]
[tar.gz][linux-arm-targz-3.1.3XX] - [Checksum][linux-arm-targz-checksum-3.1.3XX] | [![][linux-arm-badge-3.1.2XX]][linux-arm-version-3.1.2XX]
[tar.gz][linux-arm-targz-3.1.2XX] - [Checksum][linux-arm-targz-checksum-3.1.2XX] | [![][linux-arm-badge-3.1.1XX]][linux-arm-version-3.1.1XX]
[tar.gz][linux-arm-targz-3.1.1XX] - [Checksum][linux-arm-targz-checksum-3.1.1XX] | [![][linux-arm-badge-3.0.1XX]][linux-arm-version-3.0.1XX]
[tar.gz][linux-arm-targz-3.0.1XX] - [Checksum][linux-arm-targz-checksum-3.0.1XX] | +| **Linux arm64** | [![][linux-arm64-badge-master]][linux-arm64-version-master]
[tar.gz][linux-arm64-targz-master] - [Checksum][linux-arm64-targz-checksum-master] | [![][linux-arm64-badge-5.0.1XX-preview1]][linux-arm64-version-5.0.1XX-preview1]
[tar.gz][linux-arm64-targz-5.0.1XX-preview1] - [Checksum][linux-arm64-targz-checksum-5.0.1XX-preview1] | [![][linux-arm64-badge-3.1.3XX]][linux-arm64-version-3.1.3XX]
[tar.gz][linux-arm64-targz-3.1.3XX] - [Checksum][linux-arm64-targz-checksum-3.1.3XX] | [![][linux-arm64-badge-3.1.2XX]][linux-arm64-version-3.1.2XX]
[tar.gz][linux-arm64-targz-3.1.2XX] - [Checksum][linux-arm64-targz-checksum-3.1.2XX] | [![][linux-arm64-badge-3.1.1XX]][linux-arm64-version-3.1.1XX]
[tar.gz][linux-arm64-targz-3.1.1XX] - [Checksum][linux-arm64-targz-checksum-3.1.1XX] | [![][linux-arm64-badge-3.0.1XX]][linux-arm64-version-3.0.1XX]
[tar.gz][linux-arm64-targz-3.0.1XX] - [Checksum][linux-arm64-targz-checksum-3.0.1XX] | +| **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-5.0.1XX-preview1]][rhel-6-version-5.0.1XX-preview1]
[tar.gz][rhel-6-targz-5.0.1XX-preview1] - [Checksum][rhel-6-targz-checksum-5.0.1XX-preview1] | [![][rhel-6-badge-3.1.3XX]][rhel-6-version-3.1.3XX]
[tar.gz][rhel-6-targz-3.1.3XX] - [Checksum][rhel-6-targz-checksum-3.1.3XX] | [![][rhel-6-badge-3.1.2XX]][rhel-6-version-3.1.2XX]
[tar.gz][rhel-6-targz-3.1.2XX] - [Checksum][rhel-6-targz-checksum-3.1.2XX] | [![][rhel-6-badge-3.1.1XX]][rhel-6-version-3.1.1XX]
[tar.gz][rhel-6-targz-3.1.1XX] - [Checksum][rhel-6-targz-checksum-3.1.1XX] | [![][rhel-6-badge-3.0.1XX]][rhel-6-version-3.0.1XX]
[tar.gz][rhel-6-targz-3.0.1XX] - [Checksum][rhel-6-targz-checksum-3.0.1XX] | +| **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-5.0.1XX-preview1]][linux-musl-version-5.0.1XX-preview1]
[tar.gz][linux-musl-targz-5.0.1XX-preview1] - [Checksum][linux-musl-targz-checksum-5.0.1XX-preview1] | [![][linux-musl-badge-3.1.3XX]][linux-musl-version-3.1.3XX]
[tar.gz][linux-musl-targz-3.1.3XX] - [Checksum][linux-musl-targz-checksum-3.1.3XX] | [![][linux-musl-badge-3.1.2XX]][linux-musl-version-3.1.2XX]
[tar.gz][linux-musl-targz-3.1.2XX] - [Checksum][linux-musl-targz-checksum-3.1.2XX] | [![][linux-musl-badge-3.1.1XX]][linux-musl-version-3.1.1XX]
[tar.gz][linux-musl-targz-3.1.1XX] - [Checksum][linux-musl-targz-checksum-3.1.1XX] | [![][linux-musl-badge-3.0.1XX]][linux-musl-version-3.0.1XX]
[tar.gz][linux-musl-targz-3.0.1XX] - [Checksum][linux-musl-targz-checksum-3.0.1XX] | +| **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | **N/A** | [![][win-arm-badge-3.1.3XX]][win-arm-version-3.1.3XX]
[zip][win-arm-zip-3.1.3XX] - [Checksum][win-arm-zip-checksum-3.1.3XX] | [![][win-arm-badge-3.1.2XX]][win-arm-version-3.1.2XX]
[zip][win-arm-zip-3.1.2XX] - [Checksum][win-arm-zip-checksum-3.1.2XX] | [![][win-arm-badge-3.1.1XX]][win-arm-version-3.1.1XX]
[zip][win-arm-zip-3.1.1XX] - [Checksum][win-arm-zip-checksum-3.1.1XX] | [![][win-arm-badge-3.0.1XX]][win-arm-version-3.0.1XX]
[zip][win-arm-zip-3.0.1XX] - [Checksum][win-arm-zip-checksum-3.0.1XX] | +| **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | **N/A** | [![][freebsd-x64-badge-3.1.3XX]][freebsd-x64-version-3.1.3XX]
[tar.gz][freebsd-x64-zip-3.1.3XX] - [Checksum][freebsd-x64-zip-checksum-3.1.3XX] | [![][freebsd-x64-badge-3.1.2XX]][freebsd-x64-version-3.1.2XX]
[tar.gz][freebsd-x64-zip-3.1.2XX] - [Checksum][freebsd-x64-zip-checksum-3.1.2XX] | [![][freebsd-x64-badge-3.1.1XX]][freebsd-x64-version-3.1.1XX]
[tar.gz][freebsd-x64-zip-3.1.1XX] - [Checksum][freebsd-x64-zip-checksum-3.1.1XX] | [![][freebsd-x64-badge-3.0.1XX]][freebsd-x64-version-3.0.1XX]
[tar.gz][freebsd-x64-zip-3.0.1XX] - [Checksum][freebsd-x64-zip-checksum-3.0.1XX] | +| **Constituent Repo Shas** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | Reference notes: > **1**: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing the SDK from the .deb file (via dpkg or similar), then you'll need to install the corresponding dependencies first: @@ -84,6 +84,13 @@ Reference notes: [win-x64-zip-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-win-x64.zip [win-x64-zip-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/win_x64_Release_version_badge.svg +[win-x64-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[win-x64-installer-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x64.zip.sha + [win-x64-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/win_x64_Release_version_badge.svg [win-x64-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [win-x64-installer-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-win-x64.exe @@ -119,6 +126,13 @@ Reference notes: [win-x86-zip-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-win-x86.zip [win-x86-zip-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/win_x86_Release_version_badge.svg +[win-x86-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[win-x86-installer-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-x86.zip.sha + [win-x86-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/win_x86_Release_version_badge.svg [win-x86-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [win-x86-installer-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-win-x86.exe @@ -154,6 +168,13 @@ Reference notes: [osx-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-osx-x64.tar.gz [osx-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/osx_x64_Release_version_badge.svg +[osx-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[osx-installer-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-osx-x64.tar.gz.sha + [osx-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/osx_x64_Release_version_badge.svg [osx-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [osx-installer-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-osx-x64.pkg @@ -193,6 +214,15 @@ Reference notes: [linux-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-x64.tar.gz [linux-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/linux_x64_Release_version_badge.svg +[linux-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[linux-DEB-installer-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-x64.deb +[linux-DEB-installer-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-x64.deb.sha +[linux-RPM-installer-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-x64.rpm.sha +[linux-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-x64.tar.gz.sha + [linux-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/linux_x64_Release_version_badge.svg [linux-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [linux-DEB-installer-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-x64.deb @@ -230,6 +260,11 @@ Reference notes: [linux-arm-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-arm.tar.gz [linux-arm-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-arm.tar.gz.sha +[linux-arm-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/linux_arm_Release_version_badge.svg +[linux-arm-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[linux-arm-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz +[linux-arm-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-arm.tar.gz.sha + [linux-arm-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/linux_arm_Release_version_badge.svg [linux-arm-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [linux-arm-targz-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-linux-arm.tar.gz @@ -255,6 +290,11 @@ Reference notes: [linux-arm64-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-arm64.tar.gz [linux-arm64-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-arm64.tar.gz.sha +[linux-arm64-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/linux_arm64_Release_version_badge.svg +[linux-arm64-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[linux-arm64-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz +[linux-arm64-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-arm64.tar.gz.sha + [linux-arm64-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/linux_arm64_Release_version_badge.svg [linux-arm64-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [linux-arm64-targz-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-linux-arm64.tar.gz @@ -280,6 +320,11 @@ Reference notes: [rhel-6-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-rhel.6-x64.tar.gz [rhel-6-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha +[rhel-6-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/rhel.6_x64_Release_version_badge.svg +[rhel-6-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[rhel-6-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz +[rhel-6-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha + [rhel-6-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/rhel.6_x64_Release_version_badge.svg [rhel-6-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [rhel-6-targz-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-rhel.6-x64.tar.gz @@ -305,6 +350,11 @@ Reference notes: [linux-musl-targz-5.0.1XX-preview1]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-musl-x64.tar.gz [linux-musl-targz-checksum-5.0.1XX-preview1]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/5.0.1xx-preview1/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha +[linux-musl-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/linux_musl_x64_Release_version_badge.svg +[linux-musl-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[linux-musl-targz-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz +[linux-musl-targz-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-linux-musl-x64.tar.gz.sha + [linux-musl-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/linux_musl_x64_Release_version_badge.svg [linux-musl-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [linux-musl-targz-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-linux-musl-x64.tar.gz @@ -325,6 +375,11 @@ Reference notes: [win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-arm.zip [win-arm-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-arm.zip.sha +[win-arm-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/win_arm_Release_version_badge.svg +[win-arm-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[win-arm-zip-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-arm.zip +[win-arm-zip-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-win-arm.zip.sha + [win-arm-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/win_arm_Release_version_badge.svg [win-arm-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [win-arm-zip-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-win-arm.zip @@ -345,6 +400,11 @@ Reference notes: [freebsd-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-freebsd-x64.tar.gz [freebsd-x64-zip-checksum-master]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-freebsd-x64.tar.gz.sha +[freebsd-x64-badge-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/freebsd_x64_Release_version_badge.svg +[freebsd-x64-version-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/latest.version +[freebsd-x64-zip-3.1.3XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-freebsd-x64.tar.gz +[freebsd-x64-zip-checksum-3.1.3XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.1.3xx/dotnet-sdk-latest-freebsd-x64.tar.gz.sha + [freebsd-x64-badge-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/freebsd_x64_Release_version_badge.svg [freebsd-x64-version-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/latest.version [freebsd-x64-zip-3.1.2XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.1.2xx/dotnet-sdk-latest-freebsd-x64.tar.gz From 9784a1543560ae4787f22e33f88af87e094a5846 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 18:11:01 +0000 Subject: [PATCH 41/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200312.3 (#6789) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20162.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20162.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20162.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20162.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fa942b7e..07ebb0682 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 46d29189dc16c5d1793ba67ea009a83e1cbaa39b + c6ef9721cbf1366fed6d78707186b3da2e1b3143 - + https://github.com/dotnet/windowsdesktop - 46d29189dc16c5d1793ba67ea009a83e1cbaa39b + c6ef9721cbf1366fed6d78707186b3da2e1b3143 - + https://github.com/dotnet/windowsdesktop - 46d29189dc16c5d1793ba67ea009a83e1cbaa39b + c6ef9721cbf1366fed6d78707186b3da2e1b3143 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - e1ec12d0b1a9dc207aeeb099b97ba53c9ee1a6de + 86135d1aaa045293a4e24c0f8e365199f99d502a diff --git a/eng/Versions.props b/eng/Versions.props index 5ae914258..f09e87ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20161.3 + 5.0.0-preview.3.20162.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20162.1 - 5.0.0-preview.3.20162.1 - 5.0.0-preview.3.20162.1 + 5.0.0-preview.3.20162.3 + 5.0.0-preview.3.20162.3 + 5.0.0-preview.3.20162.3 From f901a296d58c368f0094211977da8b70b0b9e58f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 18:21:20 +0000 Subject: [PATCH 42/98] Update dependencies from https://github.com/dotnet/test-templates build 20200312.1 (#6787) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20162.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07ebb0682..b1b9927d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,9 +67,9 @@ https://github.com/dotnet/aspnetcore 9f5686232043b8a740128fbf6ad3bf1aaf9653ca - + https://github.com/dotnet/test-templates - 91cbc040733600df96d8a3b86af4d0044bb51a8d + e8e924b5937e75ab3049d57cb5fb196ea2e3332c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index f09e87ee8..8d5463c4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ 1.7.1 3.1.2 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.20126.1 + 1.0.2-beta4.20162.1 3.1.2 4.8.0-rc2.19462.10 From 605dced0698d8147071c48a59af3560e388bb85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2020 23:17:26 +0000 Subject: [PATCH 43/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200312.4 (#6791) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20162.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20162.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20162.4 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20162.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b9927d3..4a887f98a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - c6ef9721cbf1366fed6d78707186b3da2e1b3143 + 50cf1db5f433be97cad16f51ea6394767c5a55d5 - + https://github.com/dotnet/windowsdesktop - c6ef9721cbf1366fed6d78707186b3da2e1b3143 + 50cf1db5f433be97cad16f51ea6394767c5a55d5 - + https://github.com/dotnet/windowsdesktop - c6ef9721cbf1366fed6d78707186b3da2e1b3143 + 50cf1db5f433be97cad16f51ea6394767c5a55d5 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 48d810cd4415b4b40feeca413e11a4427546357b - + https://github.com/dotnet/wpf - 86135d1aaa045293a4e24c0f8e365199f99d502a + 8499ad81a72fc56fcb55b65beb64dcf7915d88cc diff --git a/eng/Versions.props b/eng/Versions.props index 8d5463c4a..6e0450fcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20162.2 + 5.0.0-preview.3.20162.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20162.3 - 5.0.0-preview.3.20162.3 - 5.0.0-preview.3.20162.3 + 5.0.0-preview.3.20162.4 + 5.0.0-preview.3.20162.4 + 5.0.0-preview.3.20162.4 From 847395c9937a1d1a50db8ffa22098eaf1419460a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 12:40:58 +0000 Subject: [PATCH 44/98] Update dependencies from https://github.com/dotnet/arcade build 20200312.3 (#6810) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20162.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a887f98a..d913a13e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - df7ef03819d65500711edd0bceac091264b464b1 + 16d4350184cf362cd59807b589d1c93803025abc diff --git a/global.json b/global.json index a7eb7bbe4..66803ef95 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20161.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20162.3" } } From bf8d55dcc671543e923b4661ea0b3425bb54739c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 14:36:21 +0000 Subject: [PATCH 45/98] [master] Update dependencies from dotnet/windowsdesktop (#6813) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200313.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20163.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20163.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20163.1 * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200313.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20163.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20163.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20163.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20163.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200313.3 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20163.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20163.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20163.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20163.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200314.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20164.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20164.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20164.1 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20164.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200315.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20165.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20165.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20165.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20165.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200315.3 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20165.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20165.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20165.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20165.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200316.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20166.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20166.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20166.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20165.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200316.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20166.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20166.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20166.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20165.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200316.3 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20166.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20166.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20166.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20166.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200317.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20167.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20167.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20167.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20165.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20166.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d913a13e4..f6a8e72d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 50cf1db5f433be97cad16f51ea6394767c5a55d5 + 189e7fb2f03de20c2bfeb59a045efb53bd5d856d - + https://github.com/dotnet/windowsdesktop - 50cf1db5f433be97cad16f51ea6394767c5a55d5 + 189e7fb2f03de20c2bfeb59a045efb53bd5d856d - + https://github.com/dotnet/windowsdesktop - 50cf1db5f433be97cad16f51ea6394767c5a55d5 + 189e7fb2f03de20c2bfeb59a045efb53bd5d856d https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 48d810cd4415b4b40feeca413e11a4427546357b + 084afd290719163557de1b78d85ade45c3aa0e59 - + https://github.com/dotnet/wpf - 8499ad81a72fc56fcb55b65beb64dcf7915d88cc + 24e433553b711e423afaae0f56d864cd0155b03f diff --git a/eng/Versions.props b/eng/Versions.props index 6e0450fcd..87e5733d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20160.3 + 5.0.0-preview.3.20165.6 - 5.0.0-preview.3.20162.3 + 5.0.0-preview.3.20166.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20162.4 - 5.0.0-preview.3.20162.4 - 5.0.0-preview.3.20162.4 + 5.0.0-preview.3.20167.1 + 5.0.0-preview.3.20167.1 + 5.0.0-preview.3.20167.1 From d5c5b61096c2b716e5e327f18a502be4ae649ac3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 16:01:58 +0000 Subject: [PATCH 46/98] Update dependencies from https://github.com/dotnet/arcade build 20200316.3 (#6825) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20166.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/publish-build-assets.yml | 6 ++++++ eng/common/templates/post-build/common-variables.yml | 7 +++++++ global.json | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6a8e72d6..b770fc0b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 16d4350184cf362cd59807b589d1c93803025abc + 8784a7bf875f37d9115a7e2b8c37c335f0dbf884 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index b722975f9..055304ad8 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -37,6 +37,12 @@ jobs: - name: _BuildConfig value: ${{ parameters.configuration }} - group: Publish-Build-Assets + # Skip component governance and codesign validation for SDL. These jobs + # create no content. + - name: skipComponentGovernanceDetection + value: true + - name: runCodesignValidationInjection + value: false steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 9505cf170..61488fd76 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -90,3 +90,10 @@ variables: value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json - name: InternalInstallersBlobFeedKey value: $(dotnetclimsrc-access-key) + + # Skip component governance and codesign validation for SDL. These jobs + # create no content. + - name: skipComponentGovernanceDetection + value: true + - name: runCodesignValidationInjection + value: false \ No newline at end of file diff --git a/global.json b/global.json index 66803ef95..dccb49934 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20162.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20166.3" } } From d008a960e2d6f90ab1bf1fbedb6e059f7f57049d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 16:35:57 +0000 Subject: [PATCH 47/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200317.2 (#6829) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20167.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20167.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20167.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20167.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b770fc0b5..136f07c0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 189e7fb2f03de20c2bfeb59a045efb53bd5d856d + d1f4953835f4a4f830264a8aadc4c99533af17ce - + https://github.com/dotnet/windowsdesktop - 189e7fb2f03de20c2bfeb59a045efb53bd5d856d + d1f4953835f4a4f830264a8aadc4c99533af17ce - + https://github.com/dotnet/windowsdesktop - 189e7fb2f03de20c2bfeb59a045efb53bd5d856d + d1f4953835f4a4f830264a8aadc4c99533af17ce https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 084afd290719163557de1b78d85ade45c3aa0e59 - + https://github.com/dotnet/wpf - 24e433553b711e423afaae0f56d864cd0155b03f + c0a058c7908ea8e155c2924c7bb65869f86e957a diff --git a/eng/Versions.props b/eng/Versions.props index 87e5733d8..a6bcf6956 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20166.1 + 5.0.0-preview.3.20167.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20167.1 - 5.0.0-preview.3.20167.1 - 5.0.0-preview.3.20167.1 + 5.0.0-preview.3.20167.2 + 5.0.0-preview.3.20167.2 + 5.0.0-preview.3.20167.2 From 07820ec254860477b82639bb6657b8e77f73ee5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 17:56:03 +0000 Subject: [PATCH 48/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200317.3 (#6830) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20167.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20167.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20167.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20167.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 136f07c0b..ef01b7b92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - d1f4953835f4a4f830264a8aadc4c99533af17ce + eef8d0cba1d1ea0bd85f2411687197a7254a9305 - + https://github.com/dotnet/windowsdesktop - d1f4953835f4a4f830264a8aadc4c99533af17ce + eef8d0cba1d1ea0bd85f2411687197a7254a9305 - + https://github.com/dotnet/windowsdesktop - d1f4953835f4a4f830264a8aadc4c99533af17ce + eef8d0cba1d1ea0bd85f2411687197a7254a9305 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 084afd290719163557de1b78d85ade45c3aa0e59 - + https://github.com/dotnet/wpf - c0a058c7908ea8e155c2924c7bb65869f86e957a + 8eae91258ef5dade7591491b703b272e5e59ffbd diff --git a/eng/Versions.props b/eng/Versions.props index a6bcf6956..8d8a90f7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20167.1 + 5.0.0-preview.3.20167.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20167.2 - 5.0.0-preview.3.20167.2 - 5.0.0-preview.3.20167.2 + 5.0.0-preview.3.20167.3 + 5.0.0-preview.3.20167.3 + 5.0.0-preview.3.20167.3 From ab98cad0e28ad5304b45a0f76c0d955ec0f6a03f Mon Sep 17 00:00:00 2001 From: Brian Robbins Date: Tue, 17 Mar 2020 13:48:18 -0700 Subject: [PATCH 49/98] Specify -MissingDependenciesOK to crossgen. --- src/core-sdk-tasks/Crossgen.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/Crossgen.cs b/src/core-sdk-tasks/Crossgen.cs index 82c8c9160..99e99d707 100644 --- a/src/core-sdk-tasks/Crossgen.cs +++ b/src/core-sdk-tasks/Crossgen.cs @@ -143,7 +143,7 @@ namespace Microsoft.DotNet.Build.Tasks return $"{GetReadyToRun()} {GetPlatformAssemblyPaths()} {GetDiasymReaderPath()} {GetCreateSymbols()}"; } - return $"{GetReadyToRun()} {GetInPath()} {GetOutPath()} {GetPlatformAssemblyPaths()} {GetJitPath()}"; + return $"{GetReadyToRun()} {GetMissingDependenciesOk()} {GetInPath()} {GetOutPath()} {GetPlatformAssemblyPaths()} {GetJitPath()}"; } private string GetCreateSymbols() @@ -202,6 +202,11 @@ namespace Microsoft.DotNet.Build.Tasks return $"-JITPath {JITPath}"; } + private string GetMissingDependenciesOk() + { + return "-MissingDependenciesOK"; + } + protected override void LogToolCommand(string message) { base.LogToolCommand($"{base.GetWorkingDirectory()}> {message}"); From 500ed50b319c7430c19a8b033b8f4704c5d2516e Mon Sep 17 00:00:00 2001 From: Brian Robbins Date: Tue, 17 Mar 2020 13:48:39 -0700 Subject: [PATCH 50/98] Add more assemblies to the crossgen list. --- src/redist/targets/Crossgen.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index b0aa36fea..4e45a643f 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -48,6 +48,11 @@ + + + + + From cd72f36bf9eb43058d7c18e7af872679a02d6b23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 22:23:50 +0000 Subject: [PATCH 51/98] [master] Update dependencies from dotnet/runtime (#6705) * Update dependencies from https://github.com/dotnet/runtime build 20200305.3 - Microsoft.NETCore.Platforms - 5.0.0-preview.2.20155.3 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.2.20155.3 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.2.20155.3 - Microsoft.NETCore.App.Ref - 5.0.0-preview.2.20155.3 - Microsoft.NETCore.App.Internal - 5.0.0-preview.2.20155.3 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.2.20155.3 * Update dependencies from https://github.com/dotnet/runtime build 20200309.13 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20159.13 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20159.13 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20159.13 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20159.13 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20159.13 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20159.13 * Update dependencies from https://github.com/dotnet/runtime build 20200310.8 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20160.8 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20160.8 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20160.8 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20160.8 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20160.8 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20160.8 * Update dependencies from https://github.com/dotnet/runtime build 20200311.9 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20161.9 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20161.9 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20161.9 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20161.9 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20161.9 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20161.9 * Disable debian check Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Li --- .vsts-ci.yml | 6 ------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2954264c2..b6d53d083 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -106,12 +106,6 @@ stages: _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' - Build_Debian_Stretch_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker debian' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' Build_Rhel_7_2_Release_x64: _BuildConfig: Release _DockerParameter: '--docker rhel' diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef01b7b92..27c3dfeff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop eef8d0cba1d1ea0bd85f2411687197a7254a9305 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + 2b27323e4aa61f540b8c6600f4add5b29860a0a3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8d8a90f7d..8d64d1cdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.2.20155.1 + 5.0.0-preview.3.20161.9 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 + 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20161.9 2.1.0 From 32fd5263edf3982438a3baf37b05aecaad4a64ea Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 17 Mar 2020 22:47:32 -0700 Subject: [PATCH 52/98] Bring debian 9 check back --- .vsts-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b6d53d083..2954264c2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -106,6 +106,12 @@ stages: _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' + Build_Debian_Stretch_Debug_x64: + _BuildConfig: Debug + _DockerParameter: '--docker debian' + _LinuxPortable: '' + _RuntimeIdentifier: '' + _BuildArchitecture: 'x64' Build_Rhel_7_2_Release_x64: _BuildConfig: Release _DockerParameter: '--docker rhel' From 320e530464c9f67cb0de9dbc59d221edb48d8ce7 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 17 Mar 2020 22:40:09 -0700 Subject: [PATCH 53/98] Fix deb failure --- src/redist/targets/GenerateDebs.targets | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 3a9cd6452..72305b0a7 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -293,9 +293,12 @@ PackageVersion="$(Version)" WorkingDirectory="$(DotnetDebToolDir)" /> - + - + From fd603e38848ae4915b4046a7418186f2c78e9371 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 08:15:58 +0000 Subject: [PATCH 54/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200317.4 (#6848) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20167.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20167.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20167.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20167.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20167.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27c3dfeff..8b5de3167 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - eef8d0cba1d1ea0bd85f2411687197a7254a9305 + 706f9c2cd141e7abcb0836376a306ca08ddcbc73 - + https://github.com/dotnet/windowsdesktop - eef8d0cba1d1ea0bd85f2411687197a7254a9305 + 706f9c2cd141e7abcb0836376a306ca08ddcbc73 - + https://github.com/dotnet/windowsdesktop - eef8d0cba1d1ea0bd85f2411687197a7254a9305 + 706f9c2cd141e7abcb0836376a306ca08ddcbc73 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 084afd290719163557de1b78d85ade45c3aa0e59 + 7ab0ae8b3c190fc730161910fa10316232c70828 - + https://github.com/dotnet/wpf - 8eae91258ef5dade7591491b703b272e5e59ffbd + 709dbd6985c0a6915a9993c6c5b0f6420276a6a7 diff --git a/eng/Versions.props b/eng/Versions.props index 8d64d1cdf..d2c617bc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20165.6 + 5.0.0-preview.3.20167.2 - 5.0.0-preview.3.20167.2 + 5.0.0-preview.3.20167.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20167.3 - 5.0.0-preview.3.20167.3 - 5.0.0-preview.3.20167.3 + 5.0.0-preview.3.20167.4 + 5.0.0-preview.3.20167.4 + 5.0.0-preview.3.20167.4 From b45da6fc23258ff4b7367019644a9bfe36f2c2fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 12:35:52 +0000 Subject: [PATCH 55/98] Update dependencies from https://github.com/dotnet/arcade build 20200318.1 (#6850) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20168.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +-- eng/common/cross/build-android-rootfs.sh | 39 +++++++++++++++--------- global.json | 2 +- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b5de3167..2f3bdf42a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 8784a7bf875f37d9115a7e2b8c37c335f0dbf884 + a5981bea658fa46405eb39b59f8d8bbd2730a141 diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index 5e74881eb..e7f12edb5 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -53,12 +53,20 @@ for i in "$@" done # Obtain the location of the bash script to figure out where the root of the repo is. -__CrossDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -__Android_Cross_Dir="$(cd "$__CrossDir/../../../.tools/android-rootfs" && pwd)" +__ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -__NDK_Dir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" -__lldb_Dir="$__Android_Cross_Dir/lldb" -__ToolchainDir="$__Android_Cross_Dir/android-ndk-$__NDK_Version" +__CrossDir="$__ScriptBaseDir/../../../.tools/android-rootfs" + +if [[ ! -f "$__CrossDir" ]]; then + mkdir -p "$__CrossDir" +fi + +# Resolve absolute path to avoid `../` in build logs +__CrossDir="$( cd "$__CrossDir" && pwd )" + +__NDK_Dir="$__CrossDir/android-ndk-$__NDK_Version" +__lldb_Dir="$__CrossDir/lldb" +__ToolchainDir="$__CrossDir/android-ndk-$__NDK_Version" if [[ -n "$TOOLCHAIN_DIR" ]]; then __ToolchainDir=$TOOLCHAIN_DIR @@ -77,19 +85,20 @@ echo "Target Toolchain location: $__ToolchainDir" if [ ! -d $__NDK_Dir ]; then echo Downloading the NDK into $__NDK_Dir mkdir -p $__NDK_Dir - wget -nv -nc --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip - unzip -q $__Android_Cross_Dir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__Android_Cross_Dir + wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip + unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir fi if [ ! -d $__lldb_Dir ]; then mkdir -p $__lldb_Dir echo Downloading LLDB into $__lldb_Dir - wget -nv -nc --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip - unzip -q $__Android_Cross_Dir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir + wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip -O $__CrossDir/lldb-2.3.3614996-linux-x86_64.zip + unzip -q $__CrossDir/lldb-2.3.3614996-linux-x86_64.zip -d $__lldb_Dir fi echo "Download dependencies..." -mkdir -p $__Android_Cross_Dir/tmp/$arch/ +__TmpDir=$__CrossDir/tmp/$__BuildArch/ +mkdir -p "$__TmpDir" # combined dependencies for coreclr, installer and libraries __AndroidPackages="libicu" @@ -103,11 +112,11 @@ for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArc if [[ "$path" != "Filename:" ]]; then echo "Working on: $path" - wget -qO- http://termux.net/$path | dpkg -x - $__Android_Cross_Dir/tmp/$__AndroidArch/ + wget -qO- http://termux.net/$path | dpkg -x - "$__TmpDir" fi done -cp -R $__Android_Cross_Dir/tmp/$__AndroidArch/data/data/com.termux/files/usr/* $__ToolchainDir/sysroot/usr/ +cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/" # Generate platform file for build.sh script to assign to __DistroRid echo "Generating platform file..." @@ -115,6 +124,8 @@ echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/androi echo "Now to build coreclr, libraries and installers; run:" echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory coreclr \ - --subsetCategory libraries \ + --subsetCategory coreclr +echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ + --subsetCategory libraries +echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ --subsetCategory installer diff --git a/global.json b/global.json index dccb49934..0d3991203 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20166.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20168.1" } } From 6855316c4aea1d1f0e8f41416b644830146bb04d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 12:57:56 +0000 Subject: [PATCH 56/98] Update dependencies from https://github.com/dotnet/runtime build 20200317.12 (#6851) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20167.12 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20167.12 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20167.12 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20167.12 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20167.12 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20167.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f3bdf42a..c48f822d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 706f9c2cd141e7abcb0836376a306ca08ddcbc73 - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2b27323e4aa61f540b8c6600f4add5b29860a0a3 + c0ddd1c5d1636de873398c8d9544e02289f95fec https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d2c617bc7..8641e993e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20167.12 - 5.0.0-preview.3.20161.9 - 5.0.0-preview.3.20161.9 - 5.0.0-preview.3.20161.9 - 5.0.0-preview.3.20161.9 - 5.0.0-preview.3.20161.9 + 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20167.12 2.1.0 From 84d365dbe99137403002bfbd0a6352bcb8072fe3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 14:15:59 +0000 Subject: [PATCH 57/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200318.1 (#6852) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20168.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20168.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20168.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c48f822d9..6e9a9eb05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 706f9c2cd141e7abcb0836376a306ca08ddcbc73 + 73015ddcd601e79e9c0905899b644f8a03854f53 - + https://github.com/dotnet/windowsdesktop - 706f9c2cd141e7abcb0836376a306ca08ddcbc73 + 73015ddcd601e79e9c0905899b644f8a03854f53 - + https://github.com/dotnet/windowsdesktop - 706f9c2cd141e7abcb0836376a306ca08ddcbc73 + 73015ddcd601e79e9c0905899b644f8a03854f53 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8641e993e..d54267a6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20167.4 - 5.0.0-preview.3.20167.4 - 5.0.0-preview.3.20167.4 + 5.0.0-preview.3.20168.1 + 5.0.0-preview.3.20168.1 + 5.0.0-preview.3.20168.1 From 2be6725e0a9d60bac545b9cd2527dd68556817bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 17:15:59 +0000 Subject: [PATCH 58/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200318.2 (#6856) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20168.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20168.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20168.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20168.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e9a9eb05..19c3fcaf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 73015ddcd601e79e9c0905899b644f8a03854f53 + f0695a8a29ef77df86fbc209e4c33fa93121fdaf - + https://github.com/dotnet/windowsdesktop - 73015ddcd601e79e9c0905899b644f8a03854f53 + f0695a8a29ef77df86fbc209e4c33fa93121fdaf - + https://github.com/dotnet/windowsdesktop - 73015ddcd601e79e9c0905899b644f8a03854f53 + f0695a8a29ef77df86fbc209e4c33fa93121fdaf https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 7ab0ae8b3c190fc730161910fa10316232c70828 - + https://github.com/dotnet/wpf - 709dbd6985c0a6915a9993c6c5b0f6420276a6a7 + c01b8094af4c2ae47b7faaf4c693bfccc82ab1cf diff --git a/eng/Versions.props b/eng/Versions.props index d54267a6b..3167160b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20167.3 + 5.0.0-preview.3.20168.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20168.1 - 5.0.0-preview.3.20168.1 - 5.0.0-preview.3.20168.1 + 5.0.0-preview.3.20168.2 + 5.0.0-preview.3.20168.2 + 5.0.0-preview.3.20168.2 From 347e5d6da3968fa5480d9903dd8f755225fb0dd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 19:40:58 +0000 Subject: [PATCH 59/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200318.3 (#6859) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20168.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20168.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20168.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20168.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19c3fcaf9..168ec7da3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - f0695a8a29ef77df86fbc209e4c33fa93121fdaf + 41620aa7bd245e790d1afb2139839379f787522c - + https://github.com/dotnet/windowsdesktop - f0695a8a29ef77df86fbc209e4c33fa93121fdaf + 41620aa7bd245e790d1afb2139839379f787522c - + https://github.com/dotnet/windowsdesktop - f0695a8a29ef77df86fbc209e4c33fa93121fdaf + 41620aa7bd245e790d1afb2139839379f787522c https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 7ab0ae8b3c190fc730161910fa10316232c70828 - + https://github.com/dotnet/wpf - c01b8094af4c2ae47b7faaf4c693bfccc82ab1cf + 46a775d33134a71951c2b888e6b5f55bdf99647c diff --git a/eng/Versions.props b/eng/Versions.props index 3167160b2..be5430937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20168.1 + 5.0.0-preview.3.20168.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20168.2 - 5.0.0-preview.3.20168.2 - 5.0.0-preview.3.20168.2 + 5.0.0-preview.3.20168.3 + 5.0.0-preview.3.20168.3 + 5.0.0-preview.3.20168.3 From 9b8dc22f065f826ba9ca2d2fcb85f1fa7c20ff4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 21:17:24 +0000 Subject: [PATCH 60/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200318.4 (#6861) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20168.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20168.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20168.4 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20168.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20168.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 168ec7da3..8c5d2ca6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 41620aa7bd245e790d1afb2139839379f787522c + 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 - + https://github.com/dotnet/windowsdesktop - 41620aa7bd245e790d1afb2139839379f787522c + 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 - + https://github.com/dotnet/windowsdesktop - 41620aa7bd245e790d1afb2139839379f787522c + 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 7ab0ae8b3c190fc730161910fa10316232c70828 + 631d91917ac45973d6f027073ef10633e3c34d15 - + https://github.com/dotnet/wpf - 46a775d33134a71951c2b888e6b5f55bdf99647c + 6f776dd2fd38a4ec9183e3a0835014fec27b5622 diff --git a/eng/Versions.props b/eng/Versions.props index be5430937..22b7da029 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20167.2 + 5.0.0-preview.3.20168.1 - 5.0.0-preview.3.20168.2 + 5.0.0-preview.3.20168.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20168.3 - 5.0.0-preview.3.20168.3 - 5.0.0-preview.3.20168.3 + 5.0.0-preview.3.20168.4 + 5.0.0-preview.3.20168.4 + 5.0.0-preview.3.20168.4 From b6f198184b9cc4a858276cbbb67a9963d1b352ec Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 18 Mar 2020 14:45:16 -0700 Subject: [PATCH 61/98] Adding win arm64 builds to README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index fe3cee80e..a3b545cce 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ With development builds, internal NuGet feeds are necessary for some scenarios ( | **RHEL 6** | [![][rhel-6-badge-master]][rhel-6-version-master]
[tar.gz][rhel-6-targz-master] - [Checksum][rhel-6-targz-checksum-master] | [![][rhel-6-badge-5.0.1XX-preview1]][rhel-6-version-5.0.1XX-preview1]
[tar.gz][rhel-6-targz-5.0.1XX-preview1] - [Checksum][rhel-6-targz-checksum-5.0.1XX-preview1] | [![][rhel-6-badge-3.1.3XX]][rhel-6-version-3.1.3XX]
[tar.gz][rhel-6-targz-3.1.3XX] - [Checksum][rhel-6-targz-checksum-3.1.3XX] | [![][rhel-6-badge-3.1.2XX]][rhel-6-version-3.1.2XX]
[tar.gz][rhel-6-targz-3.1.2XX] - [Checksum][rhel-6-targz-checksum-3.1.2XX] | [![][rhel-6-badge-3.1.1XX]][rhel-6-version-3.1.1XX]
[tar.gz][rhel-6-targz-3.1.1XX] - [Checksum][rhel-6-targz-checksum-3.1.1XX] | [![][rhel-6-badge-3.0.1XX]][rhel-6-version-3.0.1XX]
[tar.gz][rhel-6-targz-3.0.1XX] - [Checksum][rhel-6-targz-checksum-3.0.1XX] | | **Linux-musl** | [![][linux-musl-badge-master]][linux-musl-version-master]
[tar.gz][linux-musl-targz-master] - [Checksum][linux-musl-targz-checksum-master] | [![][linux-musl-badge-5.0.1XX-preview1]][linux-musl-version-5.0.1XX-preview1]
[tar.gz][linux-musl-targz-5.0.1XX-preview1] - [Checksum][linux-musl-targz-checksum-5.0.1XX-preview1] | [![][linux-musl-badge-3.1.3XX]][linux-musl-version-3.1.3XX]
[tar.gz][linux-musl-targz-3.1.3XX] - [Checksum][linux-musl-targz-checksum-3.1.3XX] | [![][linux-musl-badge-3.1.2XX]][linux-musl-version-3.1.2XX]
[tar.gz][linux-musl-targz-3.1.2XX] - [Checksum][linux-musl-targz-checksum-3.1.2XX] | [![][linux-musl-badge-3.1.1XX]][linux-musl-version-3.1.1XX]
[tar.gz][linux-musl-targz-3.1.1XX] - [Checksum][linux-musl-targz-checksum-3.1.1XX] | [![][linux-musl-badge-3.0.1XX]][linux-musl-version-3.0.1XX]
[tar.gz][linux-musl-targz-3.0.1XX] - [Checksum][linux-musl-targz-checksum-3.0.1XX] | | **Windows arm** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master] - [Checksum][win-arm-zip-checksum-master] | **N/A** | [![][win-arm-badge-3.1.3XX]][win-arm-version-3.1.3XX]
[zip][win-arm-zip-3.1.3XX] - [Checksum][win-arm-zip-checksum-3.1.3XX] | [![][win-arm-badge-3.1.2XX]][win-arm-version-3.1.2XX]
[zip][win-arm-zip-3.1.2XX] - [Checksum][win-arm-zip-checksum-3.1.2XX] | [![][win-arm-badge-3.1.1XX]][win-arm-version-3.1.1XX]
[zip][win-arm-zip-3.1.1XX] - [Checksum][win-arm-zip-checksum-3.1.1XX] | [![][win-arm-badge-3.0.1XX]][win-arm-version-3.0.1XX]
[zip][win-arm-zip-3.0.1XX] - [Checksum][win-arm-zip-checksum-3.0.1XX] | +| **Windows arm64** | [![][win-arm-64-badge-master]][win-arm-64-version-master]
[zip][win-arm-64-zip-master] | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | | **FreeBSD x64** | [![][freebsd-x64-badge-master]][freebsd-x64-version-master]
[tar.gz][freebsd-x64-zip-master] - [Checksum][freebsd-x64-zip-checksum-master] | **N/A** | [![][freebsd-x64-badge-3.1.3XX]][freebsd-x64-version-3.1.3XX]
[tar.gz][freebsd-x64-zip-3.1.3XX] - [Checksum][freebsd-x64-zip-checksum-3.1.3XX] | [![][freebsd-x64-badge-3.1.2XX]][freebsd-x64-version-3.1.2XX]
[tar.gz][freebsd-x64-zip-3.1.2XX] - [Checksum][freebsd-x64-zip-checksum-3.1.2XX] | [![][freebsd-x64-badge-3.1.1XX]][freebsd-x64-version-3.1.1XX]
[tar.gz][freebsd-x64-zip-3.1.1XX] - [Checksum][freebsd-x64-zip-checksum-3.1.1XX] | [![][freebsd-x64-badge-3.0.1XX]][freebsd-x64-version-3.0.1XX]
[tar.gz][freebsd-x64-zip-3.0.1XX] - [Checksum][freebsd-x64-zip-checksum-3.0.1XX] | | **Constituent Repo Shas** | **N/A** | **N/A** | **N/A** | **N/A** | **N/A** | [Git SHAs][sdk-shas-2.2.1XX] | @@ -395,6 +396,10 @@ Reference notes: [win-arm-zip-3.0.1XX]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-arm.zip [win-arm-zip-checksum-3.0.1XX]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/3.0.1xx/dotnet-sdk-latest-win-arm.zip.sha +[win-arm-64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_arm64_Release_version_badge.svg +[win-arm-64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version +[win-arm-64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-arm64.zip + [freebsd-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/freebsd_x64_Release_version_badge.svg [freebsd-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [freebsd-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-freebsd-x64.tar.gz From 5a81206e39a4f6f82dbcb511376960f7abbdc4be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 02:04:43 +0000 Subject: [PATCH 62/98] [master] Update dependencies from dotnet/aspnetcore (#6723) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200306.9 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20156.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20156.9 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20156.9 - dotnet-watch - 5.0.0-preview.3.20156.9 - dotnet-user-secrets - 5.0.0-preview.3.20156.9 - dotnet-dev-certs - 5.0.0-preview.3.20156.9 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200307.4 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20157.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20157.4 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20157.4 - dotnet-watch - 5.0.0-preview.3.20157.4 - dotnet-user-secrets - 5.0.0-preview.3.20157.4 - dotnet-dev-certs - 5.0.0-preview.3.20157.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200308.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20158.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20158.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20158.1 - dotnet-watch - 5.0.0-preview.3.20158.1 - dotnet-user-secrets - 5.0.0-preview.3.20158.1 - dotnet-dev-certs - 5.0.0-preview.3.20158.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200308.5 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20158.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20158.5 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20158.5 - dotnet-watch - 5.0.0-preview.3.20158.5 - dotnet-user-secrets - 5.0.0-preview.3.20158.5 - dotnet-dev-certs - 5.0.0-preview.3.20158.5 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200309.15 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20159.15 - dotnet-dev-certs - 5.0.0-preview.3.20159.15 - dotnet-user-secrets - 5.0.0-preview.3.20159.15 - dotnet-watch - 5.0.0-preview.3.20159.15 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20159.15 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20159.15 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200310.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20160.1 - dotnet-dev-certs - 5.0.0-preview.3.20160.1 - dotnet-user-secrets - 5.0.0-preview.3.20160.1 - dotnet-watch - 5.0.0-preview.3.20160.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20160.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20160.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200311.5 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20161.5 - dotnet-dev-certs - 5.0.0-preview.3.20161.5 - dotnet-user-secrets - 5.0.0-preview.3.20161.5 - dotnet-watch - 5.0.0-preview.3.20161.5 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20161.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20161.5 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200311.6 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20161.6 - dotnet-dev-certs - 5.0.0-preview.3.20161.6 - dotnet-user-secrets - 5.0.0-preview.3.20161.6 - dotnet-watch - 5.0.0-preview.3.20161.6 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20161.6 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20161.6 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200311.8 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20161.8 - dotnet-dev-certs - 5.0.0-preview.3.20161.8 - dotnet-user-secrets - 5.0.0-preview.3.20161.8 - dotnet-watch - 5.0.0-preview.3.20161.8 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20161.8 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20161.8 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200312.5 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20162.5 - dotnet-dev-certs - 5.0.0-preview.3.20162.5 - dotnet-user-secrets - 5.0.0-preview.3.20162.5 - dotnet-watch - 5.0.0-preview.3.20162.5 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20162.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20162.5 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200313.15 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20163.15 - dotnet-dev-certs - 5.0.0-preview.3.20163.15 - dotnet-user-secrets - 5.0.0-preview.3.20163.15 - dotnet-watch - 5.0.0-preview.3.20163.15 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20163.15 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20163.15 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200314.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20164.1 - dotnet-dev-certs - 5.0.0-preview.3.20164.1 - dotnet-user-secrets - 5.0.0-preview.3.20164.1 - dotnet-watch - 5.0.0-preview.3.20164.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20164.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20164.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200314.4 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20164.4 - dotnet-dev-certs - 5.0.0-preview.3.20164.4 - dotnet-user-secrets - 5.0.0-preview.3.20164.4 - dotnet-watch - 5.0.0-preview.3.20164.4 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20164.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20164.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200317.1 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20167.1 - dotnet-dev-certs - 5.0.0-preview.3.20167.1 - dotnet-user-secrets - 5.0.0-preview.3.20167.1 - dotnet-watch - 5.0.0-preview.3.20167.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20167.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20167.1 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200318.5 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20168.5 - dotnet-dev-certs - 5.0.0-preview.3.20168.5 - dotnet-user-secrets - 5.0.0-preview.3.20168.5 - dotnet-watch - 5.0.0-preview.3.20168.5 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20168.5 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20168.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c5d2ca6b..1a31adb57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime c0ddd1c5d1636de873398c8d9544e02289f95fec - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea - + https://github.com/dotnet/aspnetcore - 9f5686232043b8a740128fbf6ad3bf1aaf9653ca + 98ce12714ae68b62dd201cfe081c3c4345e44eea https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 22b7da029..a58b81e28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 - 5.0.0-preview.3.20156.6 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 0.2.0 From c6a7ac677d747c5272bb458c10f2ed86bb4e14f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 03:55:55 +0000 Subject: [PATCH 63/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200318.5 (#6864) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20168.5 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20168.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20168.5 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20168.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20168.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a31adb57..953576d63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 + 19283759a241db218b5e7a12d87a2ae8c336881c - + https://github.com/dotnet/windowsdesktop - 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 + 19283759a241db218b5e7a12d87a2ae8c336881c - + https://github.com/dotnet/windowsdesktop - 2c74cefbff0fda5cbefc2602e0dcf2a051fe3ba7 + 19283759a241db218b5e7a12d87a2ae8c336881c https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - 631d91917ac45973d6f027073ef10633e3c34d15 + bc0c4af69366d388b880980282209d6c9c0a2372 - + https://github.com/dotnet/wpf - 6f776dd2fd38a4ec9183e3a0835014fec27b5622 + 95102ff44b5e72543a9c6a455164a337a95fe175 diff --git a/eng/Versions.props b/eng/Versions.props index a58b81e28..90c679608 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20168.1 + 5.0.0-preview.3.20168.2 - 5.0.0-preview.3.20168.3 + 5.0.0-preview.3.20168.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20168.4 - 5.0.0-preview.3.20168.4 - 5.0.0-preview.3.20168.4 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20168.5 From 9cdacc82415c2098c98e66ad3d249db8bcccfd6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 12:30:55 +0000 Subject: [PATCH 64/98] Update dependencies from https://github.com/dotnet/arcade build 20200318.2 (#6865) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20168.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 953576d63..536a80ace 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - a5981bea658fa46405eb39b59f8d8bbd2730a141 + 1ffbf7b1b3d4842d027aecda84e9ece2bb3855d0 diff --git a/global.json b/global.json index 0d3991203..5f37e0fee 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20168.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20168.2" } } From e32805d28b7d80c7a771d990f9d77eeadce8923a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 12:52:56 +0000 Subject: [PATCH 65/98] Update dependencies from https://github.com/dotnet/runtime build 20200318.9 (#6866) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20168.9 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20168.9 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20168.9 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20168.9 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20168.9 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20168.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 536a80ace..8823bcd3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 19283759a241db218b5e7a12d87a2ae8c336881c - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c0ddd1c5d1636de873398c8d9544e02289f95fec + d2f7b6b0d46a45be29ebafca0584142219ffe495 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 90c679608..09154745e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20168.9 - 5.0.0-preview.3.20167.12 - 5.0.0-preview.3.20167.12 - 5.0.0-preview.3.20167.12 - 5.0.0-preview.3.20167.12 - 5.0.0-preview.3.20167.12 + 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20168.9 2.1.0 From be61b005e996391b26baa0a6ecdb6519849ea1e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 14:31:01 +0000 Subject: [PATCH 66/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200319.1 (#6867) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20169.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20169.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20169.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8823bcd3a..8ecf076a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 19283759a241db218b5e7a12d87a2ae8c336881c + 9cfea237295a1644cdb0f6b83a60b7c16dec8527 - + https://github.com/dotnet/windowsdesktop - 19283759a241db218b5e7a12d87a2ae8c336881c + 9cfea237295a1644cdb0f6b83a60b7c16dec8527 - + https://github.com/dotnet/windowsdesktop - 19283759a241db218b5e7a12d87a2ae8c336881c + 9cfea237295a1644cdb0f6b83a60b7c16dec8527 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 09154745e..fb8e448aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 From c0121225e4dea22bc9c2f2c06da1b0c3f0427d9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 17:06:02 +0000 Subject: [PATCH 67/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200319.2 (#6868) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20169.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20169.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20169.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20169.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ecf076a8..591f51ad5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 9cfea237295a1644cdb0f6b83a60b7c16dec8527 + 7ed1e23449ece8b9fc0855e652d8ca07d5034380 - + https://github.com/dotnet/windowsdesktop - 9cfea237295a1644cdb0f6b83a60b7c16dec8527 + 7ed1e23449ece8b9fc0855e652d8ca07d5034380 - + https://github.com/dotnet/windowsdesktop - 9cfea237295a1644cdb0f6b83a60b7c16dec8527 + 7ed1e23449ece8b9fc0855e652d8ca07d5034380 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms bc0c4af69366d388b880980282209d6c9c0a2372 - + https://github.com/dotnet/wpf - 95102ff44b5e72543a9c6a455164a337a95fe175 + 3c1a9f642426a0455adca3e3cbc751cfc9a45987 diff --git a/eng/Versions.props b/eng/Versions.props index fb8e448aa..c81dd21fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20168.4 + 5.0.0-preview.3.20169.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.2 + 5.0.0-preview.3.20169.2 + 5.0.0-preview.3.20169.2 From aaa5453445888840d80d4b5f0f3e18e0da04ea9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 19:05:59 +0000 Subject: [PATCH 68/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200319.3 (#6869) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20169.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20169.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20169.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20169.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 591f51ad5..e1f08eeca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 7ed1e23449ece8b9fc0855e652d8ca07d5034380 + 915df4c3b98e138a085fb3009e915066e83d15fc - + https://github.com/dotnet/windowsdesktop - 7ed1e23449ece8b9fc0855e652d8ca07d5034380 + 915df4c3b98e138a085fb3009e915066e83d15fc - + https://github.com/dotnet/windowsdesktop - 7ed1e23449ece8b9fc0855e652d8ca07d5034380 + 915df4c3b98e138a085fb3009e915066e83d15fc https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms bc0c4af69366d388b880980282209d6c9c0a2372 - + https://github.com/dotnet/wpf - 3c1a9f642426a0455adca3e3cbc751cfc9a45987 + 4fb1a1612e4972b9f23f44fda43bf495cae3e1a0 diff --git a/eng/Versions.props b/eng/Versions.props index c81dd21fc..9fd401bf6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20169.2 - 5.0.0-preview.3.20169.2 - 5.0.0-preview.3.20169.2 + 5.0.0-preview.3.20169.3 + 5.0.0-preview.3.20169.3 + 5.0.0-preview.3.20169.3 From 786a13cc6a833204fedc2484ca08137e613267bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 20:39:10 +0000 Subject: [PATCH 69/98] Update dependencies from https://github.com/dotnet/runtime build 20200319.1 (#6870) - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.3.20169.1 - Microsoft.NETCore.App.Ref - 5.0.0-preview.3.20169.1 - Microsoft.NETCore.App.Internal - 5.0.0-preview.3.20169.1 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.3.20169.1 - Microsoft.NETCore.Platforms - 5.0.0-preview.3.20169.1 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.3.20169.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1f08eeca..93f0b5e59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 915df4c3b98e138a085fb3009e915066e83d15fc - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d2f7b6b0d46a45be29ebafca0584142219ffe495 + bc28cbef855fdb9cb3769c41276b62d49326b215 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9fd401bf6..58a9e5664 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20168.9 - 5.0.0-preview.3.20168.9 - 5.0.0-preview.3.20168.9 - 5.0.0-preview.3.20168.9 - 5.0.0-preview.3.20168.9 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 2.1.0 From fc006a3b11f080e43d9d4eb95b633603e9c18cae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 22:31:04 +0000 Subject: [PATCH 70/98] Update dependencies from https://github.com/dotnet/aspnetcore build 20200319.1 (#6871) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20169.1 - dotnet-dev-certs - 5.0.0-preview.3.20169.1 - dotnet-user-secrets - 5.0.0-preview.3.20169.1 - dotnet-watch - 5.0.0-preview.3.20169.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20169.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20169.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93f0b5e59..a9ff25382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb - + https://github.com/dotnet/aspnetcore - 98ce12714ae68b62dd201cfe081c3c4345e44eea + 44812e163784c52feb1933f3a4e72948b799f3bb https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 58a9e5664..9d6b28485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 - 5.0.0-preview.3.20168.5 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.1 0.2.0 From 44d53dcb05d6e15b4e0192bfaa5725133a383d58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 04:42:08 +0000 Subject: [PATCH 71/98] [master] Update dependencies from dotnet/aspnetcore (#6872) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200319.2 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20169.2 - dotnet-dev-certs - 5.0.0-preview.3.20169.2 - dotnet-user-secrets - 5.0.0-preview.3.20169.2 - dotnet-watch - 5.0.0-preview.3.20169.2 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20169.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20169.2 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200319.4 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20169.4 - dotnet-user-secrets - 5.0.0-preview.3.20169.4 - dotnet-watch - 5.0.0-preview.3.20169.4 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20169.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20169.4 - dotnet-dev-certs - 5.0.0-preview.3.20169.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9ff25382..8da270fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc - + https://github.com/dotnet/aspnetcore - 44812e163784c52feb1933f3a4e72948b799f3bb + 2808c46f35578516d166b19f26f218c5346b10cc https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9d6b28485..134757e4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20169.4 0.2.0 From 99c94b79dff313a14ff569050733036194a435e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 10:00:57 +0000 Subject: [PATCH 72/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200320.1 (#6873) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20170.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20170.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20170.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20169.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20169.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8da270fd2..cd2345a6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 915df4c3b98e138a085fb3009e915066e83d15fc + 571c1a8567008e82c48ef941c8792b307daa9627 - + https://github.com/dotnet/windowsdesktop - 915df4c3b98e138a085fb3009e915066e83d15fc + 571c1a8567008e82c48ef941c8792b307daa9627 - + https://github.com/dotnet/windowsdesktop - 915df4c3b98e138a085fb3009e915066e83d15fc + 571c1a8567008e82c48ef941c8792b307daa9627 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ cda04f124e3571e186ecc8f26958ceeaffb2a469 - + https://github.com/dotnet/winforms - bc0c4af69366d388b880980282209d6c9c0a2372 + 67f4ee6f5e1b422e3edf470c5f18481246b22bbc - + https://github.com/dotnet/wpf - 4fb1a1612e4972b9f23f44fda43bf495cae3e1a0 + 6af5fe94f7eb5415a2620a89750c93be3b1bc599 diff --git a/eng/Versions.props b/eng/Versions.props index 134757e4a..d89ecb94e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20168.2 + 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.2 + 5.0.0-preview.3.20169.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20169.3 - 5.0.0-preview.3.20169.3 - 5.0.0-preview.3.20169.3 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 From 35962621c20760587654a214a69ad00f4035a8b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 11:31:02 +0000 Subject: [PATCH 73/98] Update dependencies from https://github.com/dotnet/aspnetcore build 20200320.1 (#6874) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20170.1 - dotnet-user-secrets - 5.0.0-preview.3.20170.1 - dotnet-watch - 5.0.0-preview.3.20170.1 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20170.1 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20170.1 - dotnet-dev-certs - 5.0.0-preview.3.20170.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd2345a6c..15faea670 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d - + https://github.com/dotnet/aspnetcore - 2808c46f35578516d166b19f26f218c5346b10cc + c4ce65e2dc4a2f77fe872670b8813442df91711d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d89ecb94e..3cdc6db25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.4 - 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.1 0.2.0 From 280735abb900fa8b3139c8bca6f78054eac999f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 12:34:30 +0000 Subject: [PATCH 74/98] [master] Update dependencies from dotnet/templating (#6811) * Update dependencies from https://github.com/dotnet/templating build 20200313.2 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20163.2 * Update dependencies from https://github.com/dotnet/templating build 20200314.5 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20164.5 * Update dependencies from https://github.com/dotnet/templating build 20200317.2 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20167.2 * Update dependencies from https://github.com/dotnet/templating build 20200318.1 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20168.1 * Change the test accordingly * Update dependencies from https://github.com/dotnet/templating build 20200319.1 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20169.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Li --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../GivenSelfContainedAppsRollForward.cs | 2 +- test/EndToEnd/SupportedNetCoreAppVersions.cs | 21 ++++++++++++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15faea670..051ae4421 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/templating - f15388ee6e45a8923fba0f54f55154aee991fb84 + c3f88f3471bb22c489784faf5a84e44263f4f994 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 3cdc6db25..f1d95856c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.2.20151.1 + 5.0.0-preview.3.20169.1 diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 6b85a2400..4e4d800ae 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -157,7 +157,7 @@ namespace EndToEnd .Element(ns + "TargetFramework") .Value; - SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}") + SupportedNetCoreAppVersions.TargetFrameworkShortFolderVersion .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " + "of .NET Core created by \"dotnet new\""); } diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 512b9e78a..ab579cb30 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -28,7 +28,26 @@ namespace EndToEnd } } - + public static IEnumerable TargetFrameworkShortFolderVersion + { + get + { + var targetFrameworkShortFolderVersion = new List(); + foreach (var v in Versions) + { + if (Version.Parse(v).Major >= 5) + { + targetFrameworkShortFolderVersion.Add($"net{v}"); + } + else + { + targetFrameworkShortFolderVersion.Add($"netcoreapp{v}"); + } + } + + return targetFrameworkShortFolderVersion; + } + } } public class SupportedAspNetCoreVersions : IEnumerable From 7f8787c08008739b533869f417e99935eddd75e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 12:35:54 +0000 Subject: [PATCH 75/98] Update dependencies from https://github.com/dotnet/arcade build 20200320.1 (#6875) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20170.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 051ae4421..c9fc18bc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 1ffbf7b1b3d4842d027aecda84e9ece2bb3855d0 + 08954d95550364cb78764b078c9b24383f8cda48 diff --git a/global.json b/global.json index 5f37e0fee..d33e5d862 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20168.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20170.1" } } From f59b3617d5594e3061888ecc5ef4093664265621 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 19:01:10 +0000 Subject: [PATCH 76/98] Update dependencies from https://github.com/dotnet/aspnetcore build 20200320.2 (#6878) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.3.20170.2 - dotnet-user-secrets - 5.0.0-preview.3.20170.2 - dotnet-watch - 5.0.0-preview.3.20170.2 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.3.20170.2 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.3.20170.2 - dotnet-dev-certs - 5.0.0-preview.3.20170.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9fc18bc2..c9cc1d960 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bc28cbef855fdb9cb3769c41276b62d49326b215 - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce - + https://github.com/dotnet/aspnetcore - c4ce65e2dc4a2f77fe872670b8813442df91711d + a2d8852186643561d783e5ea6c9bc65fc97810ce https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f1d95856c..15dfaca6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20170.2 + 5.0.0-preview.3.20170.2 0.2.0 From 7a265c390eff78913b4e2df50be9b044ae33cb50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 20:01:21 +0000 Subject: [PATCH 77/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200320.3 (#6879) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20170.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20170.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20170.3 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20170.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9cc1d960..dff573a65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 571c1a8567008e82c48ef941c8792b307daa9627 + 22eacf337ed85c364014b8a59df053e88cb7b1d0 - + https://github.com/dotnet/windowsdesktop - 571c1a8567008e82c48ef941c8792b307daa9627 + 22eacf337ed85c364014b8a59df053e88cb7b1d0 - + https://github.com/dotnet/windowsdesktop - 571c1a8567008e82c48ef941c8792b307daa9627 + 22eacf337ed85c364014b8a59df053e88cb7b1d0 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms 67f4ee6f5e1b422e3edf470c5f18481246b22bbc - + https://github.com/dotnet/wpf - 6af5fe94f7eb5415a2620a89750c93be3b1bc599 + 474f50302ec51dffc68d96cfe43f9693fe5e957e diff --git a/eng/Versions.props b/eng/Versions.props index 15dfaca6c..a9ce1a6aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20169.3 + 5.0.0-preview.3.20170.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 - 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20170.3 + 5.0.0-preview.3.20170.3 + 5.0.0-preview.3.20170.3 From 02ee648fc6ef21f615e98cf4fe0b0c7e57fb936a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 21:42:20 +0000 Subject: [PATCH 78/98] [master] Update dependencies from dotnet/sdk (#6774) * Update dependencies from https://github.com/dotnet/sdk build 20200311.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20161.2 * Update dependencies from https://github.com/dotnet/sdk build 20200311.4 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.4 - Microsoft.NET.Sdk - 5.0.100-preview.3.20161.4 * Update dependencies from https://github.com/dotnet/sdk build 20200311.6 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20161.6 * Update dependencies from https://github.com/dotnet/sdk build 20200311.7 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.7 - Microsoft.NET.Sdk - 5.0.100-preview.3.20161.7 * Update dependencies from https://github.com/dotnet/sdk build 20200312.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.1 * Update dependencies from https://github.com/dotnet/sdk build 20200312.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.2 * Update dependencies from https://github.com/dotnet/sdk build 20200312.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.3 * Update dependencies from https://github.com/dotnet/sdk build 20200312.5 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.5 * Update dependencies from https://github.com/dotnet/sdk build 20200312.7 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.7 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.7 * Update dependencies from https://github.com/dotnet/sdk build 20200312.9 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.9 - Microsoft.NET.Sdk - 5.0.100-preview.3.20162.9 * Update dependencies from https://github.com/dotnet/sdk build 20200313.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20163.1 * Update dependencies from https://github.com/dotnet/sdk build 20200313.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20163.2 * Update dependencies from https://github.com/dotnet/sdk build 20200313.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20163.3 * Update dependencies from https://github.com/dotnet/sdk build 20200315.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20165.1 * Update dependencies from https://github.com/dotnet/sdk build 20200315.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20165.3 * Update dependencies from https://github.com/dotnet/sdk build 20200317.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20167.2 * Update dependencies from https://github.com/dotnet/sdk build 20200317.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20167.3 * Update dependencies from https://github.com/dotnet/sdk build 20200317.5 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.5 - Microsoft.NET.Sdk - 5.0.100-preview.3.20167.5 * Update dependencies from https://github.com/dotnet/sdk build 20200317.8 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.8 - Microsoft.NET.Sdk - 5.0.100-preview.3.20167.8 * Update dependencies from https://github.com/dotnet/sdk build 20200318.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.1 * Update dependencies from https://github.com/dotnet/sdk build 20200318.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.2 * Update dependencies from https://github.com/dotnet/sdk build 20200318.6 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.6 * Update dependencies from https://github.com/dotnet/sdk build 20200318.7 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.7 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.7 * Update dependencies from https://github.com/dotnet/sdk build 20200318.8 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.8 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.8 * Update dependencies from https://github.com/dotnet/sdk build 20200318.9 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.9 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.9 * Update dependencies from https://github.com/dotnet/sdk build 20200318.10 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.10 - Microsoft.NET.Sdk - 5.0.100-preview.3.20168.10 * Update dependencies from https://github.com/dotnet/sdk build 20200319.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20169.1 * Update dependencies from https://github.com/dotnet/sdk build 20200319.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20169.2 * Update dependencies from https://github.com/dotnet/sdk build 20200319.3 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20169.3 * Update dependencies from https://github.com/dotnet/sdk build 20200319.4 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.4 - Microsoft.NET.Sdk - 5.0.100-preview.3.20169.4 * Update dependencies from https://github.com/dotnet/sdk build 20200320.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20170.1 * Partially reordered paths passed to crossgen * Update dependencies from https://github.com/dotnet/sdk build 20200320.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20170.2 * Partially reordered paths passed to crossgen * Partially reordered paths passed to crossgen Co-authored-by: dotnet-maestro[bot] Co-authored-by: Bekir Ozturk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- src/redist/targets/Crossgen.targets | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dff573a65..9d56e448e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating c3f88f3471bb22c489784faf5a84e44263f4f994 - + https://github.com/dotnet/sdk - cda04f124e3571e186ecc8f26958ceeaffb2a469 + ac7fd98a7b6f8e625aab8977029813bec6088e70 - + https://github.com/dotnet/sdk - cda04f124e3571e186ecc8f26958ceeaffb2a469 + ac7fd98a7b6f8e625aab8977029813bec6088e70 diff --git a/eng/Versions.props b/eng/Versions.props index a9ce1a6aa..a36c04969 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20160.12 - 5.0.100-preview.3.20160.12 + 5.0.100-preview.3.20170.2 + 5.0.100-preview.3.20170.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 1c19fd24c..f1db8315b 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -87,6 +87,14 @@ + + + + + From f30c97b20977b874d4051bd53b7f0039d87810d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 12:11:17 +0000 Subject: [PATCH 79/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200321.1 (#6881) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20171.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20171.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20171.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20171.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20171.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d56e448e..dc60241e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 22eacf337ed85c364014b8a59df053e88cb7b1d0 + ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe - + https://github.com/dotnet/windowsdesktop - 22eacf337ed85c364014b8a59df053e88cb7b1d0 + ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe - + https://github.com/dotnet/windowsdesktop - 22eacf337ed85c364014b8a59df053e88cb7b1d0 + ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ ac7fd98a7b6f8e625aab8977029813bec6088e70 - + https://github.com/dotnet/winforms - 67f4ee6f5e1b422e3edf470c5f18481246b22bbc + 8138af18dd43f99c98428c996960b7d3d5377d05 - + https://github.com/dotnet/wpf - 474f50302ec51dffc68d96cfe43f9693fe5e957e + 5465dc79c46d44c4af79a170068a47c464610aa4 diff --git a/eng/Versions.props b/eng/Versions.props index a36c04969..78bed345a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20169.4 + 5.0.0-preview.3.20171.1 - 5.0.0-preview.3.20170.1 + 5.0.0-preview.3.20171.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20170.3 - 5.0.0-preview.3.20170.3 - 5.0.0-preview.3.20170.3 + 5.0.0-preview.3.20171.1 + 5.0.0-preview.3.20171.1 + 5.0.0-preview.3.20171.1 From b32c4cd134fcfd11a332c2580c8ebc9c34143d52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 12:36:49 +0000 Subject: [PATCH 80/98] Update dependencies from https://github.com/dotnet/arcade build 20200320.4 (#6882) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20170.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc60241e9..77e9ac92b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 08954d95550364cb78764b078c9b24383f8cda48 + 89aa923e9c53483f61ec28bf9d546ac39d54a26b diff --git a/global.json b/global.json index d33e5d862..970485cfa 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20170.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20170.4" } } From fdf5451187c5ba9d35dc52eb8f33d5ddb633e05e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 13:06:37 +0000 Subject: [PATCH 81/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200321.2 (#6883) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20171.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20171.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20171.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20171.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20171.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77e9ac92b..0187d7021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe + 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd - + https://github.com/dotnet/windowsdesktop - ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe + 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd - + https://github.com/dotnet/windowsdesktop - ea59ddedd1cebbe6a41d18aadc4b4cb17b6973fe + 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ ac7fd98a7b6f8e625aab8977029813bec6088e70 - + https://github.com/dotnet/winforms - 8138af18dd43f99c98428c996960b7d3d5377d05 + b044c87d81de78cbd52d27a230011475af81f3c2 - + https://github.com/dotnet/wpf - 5465dc79c46d44c4af79a170068a47c464610aa4 + 1e4c47523de4b1b57c2df617df68d0257f4f5fb9 diff --git a/eng/Versions.props b/eng/Versions.props index 78bed345a..144383145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20171.1 + 5.0.0-preview.3.20171.2 - 5.0.0-preview.3.20171.1 + 5.0.0-preview.3.20171.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20171.1 - 5.0.0-preview.3.20171.1 - 5.0.0-preview.3.20171.1 + 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20171.2 From 0835da1df576677f1d7309bfc8b5a9ec1c9033bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 14:16:12 +0000 Subject: [PATCH 82/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200321.3 (#6884) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20171.3 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20171.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20171.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0187d7021..6ad66dcca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd + 019ee995d925cf5b6a8fc38c7166209c77aafcb7 - + https://github.com/dotnet/windowsdesktop - 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd + 019ee995d925cf5b6a8fc38c7166209c77aafcb7 - + https://github.com/dotnet/windowsdesktop - 224e872812a6dbdd1f5bac70ec779ffcebc2b5dd + 019ee995d925cf5b6a8fc38c7166209c77aafcb7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 144383145..7c1631bdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20171.2 - 5.0.0-preview.3.20171.2 - 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20171.3 + 5.0.0-preview.3.20171.3 + 5.0.0-preview.3.20171.3 From 1d3e22d1d1f49fcab126a58b7152bb06ed51c973 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 15:16:16 +0000 Subject: [PATCH 83/98] Update dependencies from https://github.com/dotnet/sdk build 20200321.1 (#6885) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20171.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20171.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ad66dcca..15ecb5566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating c3f88f3471bb22c489784faf5a84e44263f4f994 - + https://github.com/dotnet/sdk - ac7fd98a7b6f8e625aab8977029813bec6088e70 + d7919c37d73e760dfb02e2bc826724459d94ee3b - + https://github.com/dotnet/sdk - ac7fd98a7b6f8e625aab8977029813bec6088e70 + d7919c37d73e760dfb02e2bc826724459d94ee3b diff --git a/eng/Versions.props b/eng/Versions.props index 7c1631bdd..f7640ecdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20170.2 - 5.0.100-preview.3.20170.2 + 5.0.100-preview.3.20171.1 + 5.0.100-preview.3.20171.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be48d2850ae94912d5e409949bee5e02994a7b07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 16:46:19 +0000 Subject: [PATCH 84/98] Update dependencies from https://github.com/dotnet/sdk build 20200321.2 (#6886) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20171.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20171.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15ecb5566..48a6ab7f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating c3f88f3471bb22c489784faf5a84e44263f4f994 - + https://github.com/dotnet/sdk - d7919c37d73e760dfb02e2bc826724459d94ee3b + bdec7986d34487297fae60dc4da5ea2817c224e7 - + https://github.com/dotnet/sdk - d7919c37d73e760dfb02e2bc826724459d94ee3b + bdec7986d34487297fae60dc4da5ea2817c224e7 diff --git a/eng/Versions.props b/eng/Versions.props index f7640ecdf..76f786826 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20171.1 - 5.0.100-preview.3.20171.1 + 5.0.100-preview.3.20171.2 + 5.0.100-preview.3.20171.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4cdd17a34e3956378e40ad4e7d231b5967722d70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 17:11:14 +0000 Subject: [PATCH 85/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200321.4 (#6887) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20171.4 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20171.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20171.4 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20171.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48a6ab7f2..978c3baef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 019ee995d925cf5b6a8fc38c7166209c77aafcb7 + 8c9cd118511e6686d4f3f90da4c24501372c9960 - + https://github.com/dotnet/windowsdesktop - 019ee995d925cf5b6a8fc38c7166209c77aafcb7 + 8c9cd118511e6686d4f3f90da4c24501372c9960 - + https://github.com/dotnet/windowsdesktop - 019ee995d925cf5b6a8fc38c7166209c77aafcb7 + 8c9cd118511e6686d4f3f90da4c24501372c9960 https://github.com/dotnet/runtime @@ -88,9 +88,9 @@ https://github.com/dotnet/winforms b044c87d81de78cbd52d27a230011475af81f3c2 - + https://github.com/dotnet/wpf - 1e4c47523de4b1b57c2df617df68d0257f4f5fb9 + 1e30ab63b8c5d13951161e60a0207efe1dfaad67 diff --git a/eng/Versions.props b/eng/Versions.props index 76f786826..c8e27caa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ - 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20171.3 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20171.3 - 5.0.0-preview.3.20171.3 - 5.0.0-preview.3.20171.3 + 5.0.0-preview.3.20171.4 + 5.0.0-preview.3.20171.4 + 5.0.0-preview.3.20171.4 From 1b30a4135bb4747801bcdf2b89955edbbd01f46c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 21 Mar 2020 18:16:19 +0000 Subject: [PATCH 86/98] Update dependencies from https://github.com/dotnet/sdk build 20200321.3 (#6889) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20171.3 - Microsoft.NET.Sdk - 5.0.100-preview.3.20171.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 978c3baef..4ab857b29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating c3f88f3471bb22c489784faf5a84e44263f4f994 - + https://github.com/dotnet/sdk - bdec7986d34487297fae60dc4da5ea2817c224e7 + 801baace77b9a99587b58620d20faa7f19bf8fdf - + https://github.com/dotnet/sdk - bdec7986d34487297fae60dc4da5ea2817c224e7 + 801baace77b9a99587b58620d20faa7f19bf8fdf diff --git a/eng/Versions.props b/eng/Versions.props index c8e27caa2..7a28347a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20171.2 - 5.0.100-preview.3.20171.2 + 5.0.100-preview.3.20171.3 + 5.0.100-preview.3.20171.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fa3d3a5e0a7bbc510409e76efdb6b79c562b90bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 12:42:44 +0000 Subject: [PATCH 87/98] Update dependencies from https://github.com/dotnet/templating build 20200321.2 (#6891) - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20171.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ab857b29..499f582f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/templating - c3f88f3471bb22c489784faf5a84e44263f4f994 + 2d2a67b03e65c8819f676b3318574dc8d09d5c46 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 7a28347a4..ea8893ddc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.3.20169.1 + 5.0.0-preview.3.20171.2 From 96deb2b122ce99cc537eeea87dd785fb6dad16f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 12:46:45 +0000 Subject: [PATCH 88/98] Update dependencies from https://github.com/dotnet/arcade build 20200321.1 (#6890) - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20171.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 499f582f8..007ccc8b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 89aa923e9c53483f61ec28bf9d546ac39d54a26b + 7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd diff --git a/global.json b/global.json index 970485cfa..c0eacf6a3 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20170.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20171.1" } } From 55c906efaef19f86361290088f4156470c993560 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 13:55:13 +0000 Subject: [PATCH 89/98] [master] Update dependencies from dotnet/windowsdesktop (#6888) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200321.5 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20171.5 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20171.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20171.5 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20171.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20171.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200322.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20172.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20172.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20172.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20171.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20171.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 007ccc8b7..bf8a99cce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 8c9cd118511e6686d4f3f90da4c24501372c9960 + 0fea59dc2d1685f615f923d655b843f47e5fa467 - + https://github.com/dotnet/windowsdesktop - 8c9cd118511e6686d4f3f90da4c24501372c9960 + 0fea59dc2d1685f615f923d655b843f47e5fa467 - + https://github.com/dotnet/windowsdesktop - 8c9cd118511e6686d4f3f90da4c24501372c9960 + 0fea59dc2d1685f615f923d655b843f47e5fa467 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 801baace77b9a99587b58620d20faa7f19bf8fdf - + https://github.com/dotnet/winforms - b044c87d81de78cbd52d27a230011475af81f3c2 + 72ccb6270d499fcc3afe3436f3f97db99a3ca933 - + https://github.com/dotnet/wpf - 1e30ab63b8c5d13951161e60a0207efe1dfaad67 + d0aba40608d90bf0029b5ca366b96bce1d1fbdd1 diff --git a/eng/Versions.props b/eng/Versions.props index ea8893ddc..fd5826799 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20171.3 - 5.0.0-preview.3.20171.3 + 5.0.0-preview.3.20171.4 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20171.4 - 5.0.0-preview.3.20171.4 - 5.0.0-preview.3.20171.4 + 5.0.0-preview.3.20172.1 + 5.0.0-preview.3.20172.1 + 5.0.0-preview.3.20172.1 From c389fbaae9b85b98ff6a7b7ea4b9b40f206952a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 16:06:16 +0000 Subject: [PATCH 90/98] Update dependencies from https://github.com/dotnet/sdk build 20200322.1 (#6892) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20172.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20172.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf8a99cce..a1b03b305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 2d2a67b03e65c8819f676b3318574dc8d09d5c46 - + https://github.com/dotnet/sdk - 801baace77b9a99587b58620d20faa7f19bf8fdf + 69960e2859fffe37c022232892536b4e4a5f4f24 - + https://github.com/dotnet/sdk - 801baace77b9a99587b58620d20faa7f19bf8fdf + 69960e2859fffe37c022232892536b4e4a5f4f24 diff --git a/eng/Versions.props b/eng/Versions.props index fd5826799..8abdbbf12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20171.3 - 5.0.100-preview.3.20171.3 + 5.0.100-preview.3.20172.1 + 5.0.100-preview.3.20172.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53de1e2f0af5ea9f30c58589d9aa8d855eaf0295 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 17:36:13 +0000 Subject: [PATCH 91/98] Update dependencies from https://github.com/dotnet/sdk build 20200322.2 (#6893) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20172.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20172.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1b03b305..85966d154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 2d2a67b03e65c8819f676b3318574dc8d09d5c46 - + https://github.com/dotnet/sdk - 69960e2859fffe37c022232892536b4e4a5f4f24 + 1716dda65c388934d5c0e7f0d71467e91e921d42 - + https://github.com/dotnet/sdk - 69960e2859fffe37c022232892536b4e4a5f4f24 + 1716dda65c388934d5c0e7f0d71467e91e921d42 diff --git a/eng/Versions.props b/eng/Versions.props index 8abdbbf12..c0e99b840 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20172.1 - 5.0.100-preview.3.20172.1 + 5.0.100-preview.3.20172.2 + 5.0.100-preview.3.20172.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 380f73a7400c5075d3d71215a8b067db065fe36b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 12:33:03 +0000 Subject: [PATCH 92/98] Update dependencies from https://github.com/dotnet/templating build 20200322.1 (#6895) - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.3.20172.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85966d154..d616ede02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,9 +71,9 @@ https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/templating - 2d2a67b03e65c8819f676b3318574dc8d09d5c46 + 42b39532639ab11fd335961b262ea2620b12407c https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index c0e99b840..7a455eae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.3.20171.2 + 5.0.0-preview.3.20172.1 From 0a6cec10e4a798240b853ebab3fbdcb40eb30fdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 23:21:00 +0000 Subject: [PATCH 93/98] Update dependencies from https://github.com/dotnet/sdk build 20200323.2 (#6896) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20173.2 - Microsoft.NET.Sdk - 5.0.100-preview.3.20173.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d616ede02..5344172a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 42b39532639ab11fd335961b262ea2620b12407c - + https://github.com/dotnet/sdk - 1716dda65c388934d5c0e7f0d71467e91e921d42 + 61eb83542f4f73ef20766e848b44f674eb9f6333 - + https://github.com/dotnet/sdk - 1716dda65c388934d5c0e7f0d71467e91e921d42 + 61eb83542f4f73ef20766e848b44f674eb9f6333 diff --git a/eng/Versions.props b/eng/Versions.props index 7a455eae8..137530fdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20172.2 - 5.0.100-preview.3.20172.2 + 5.0.100-preview.3.20173.2 + 5.0.100-preview.3.20173.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From faf66d328fd44660e2c0bfe65e1b5702deb6bfc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 03:41:41 +0000 Subject: [PATCH 94/98] [master] Update dependencies from dotnet/windowsdesktop (#6894) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200322.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20172.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20172.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20172.2 Dependency coherency updates - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20172.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200323.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20173.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20173.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20173.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20173.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20173.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5344172a3..521949b3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 0fea59dc2d1685f615f923d655b843f47e5fa467 + b7b230f4687547192a2aaeb97859769a3baf6b02 - + https://github.com/dotnet/windowsdesktop - 0fea59dc2d1685f615f923d655b843f47e5fa467 + b7b230f4687547192a2aaeb97859769a3baf6b02 - + https://github.com/dotnet/windowsdesktop - 0fea59dc2d1685f615f923d655b843f47e5fa467 + b7b230f4687547192a2aaeb97859769a3baf6b02 https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 61eb83542f4f73ef20766e848b44f674eb9f6333 - + https://github.com/dotnet/winforms - 72ccb6270d499fcc3afe3436f3f97db99a3ca933 + 376191eec30f5fa0177e863ec7d0c688c6a04c6f - + https://github.com/dotnet/wpf - d0aba40608d90bf0029b5ca366b96bce1d1fbdd1 + 1838a6b866902a21ba417705918dc19b8427b697 diff --git a/eng/Versions.props b/eng/Versions.props index 137530fdf..3fb9d49f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20171.3 + 5.0.0-preview.3.20173.1 - 5.0.0-preview.3.20171.4 + 5.0.0-preview.3.20173.1 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20172.1 - 5.0.0-preview.3.20172.1 - 5.0.0-preview.3.20172.1 + 5.0.0-preview.3.20173.1 + 5.0.0-preview.3.20173.1 + 5.0.0-preview.3.20173.1 From 1539d0b417a0788555360c98bb46240fbe8c873a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 04:50:53 +0000 Subject: [PATCH 95/98] Update dependencies from https://github.com/dotnet/sdk build 20200323.6 (#6898) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20173.6 - Microsoft.NET.Sdk - 5.0.100-preview.3.20173.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 521949b3e..ea050f6e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 42b39532639ab11fd335961b262ea2620b12407c - + https://github.com/dotnet/sdk - 61eb83542f4f73ef20766e848b44f674eb9f6333 + 129ce81522693d6ac03e51d05c025b030cfabd30 - + https://github.com/dotnet/sdk - 61eb83542f4f73ef20766e848b44f674eb9f6333 + 129ce81522693d6ac03e51d05c025b030cfabd30 diff --git a/eng/Versions.props b/eng/Versions.props index 3fb9d49f0..55a987ba5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20173.2 - 5.0.100-preview.3.20173.2 + 5.0.100-preview.3.20173.6 + 5.0.100-preview.3.20173.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f92c1918524ffc745d9cb417a61aa9465a3d904 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 05:20:58 +0000 Subject: [PATCH 96/98] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200323.2 (#6899) - Microsoft.WindowsDesktop.App - 5.0.0-preview.3.20173.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.3.20173.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.3.20173.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.3.20173.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.3.20173.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea050f6e6..64ec1ada5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - b7b230f4687547192a2aaeb97859769a3baf6b02 + e5b713da049efd0da0559ee0012bcb86609b992f - + https://github.com/dotnet/windowsdesktop - b7b230f4687547192a2aaeb97859769a3baf6b02 + e5b713da049efd0da0559ee0012bcb86609b992f - + https://github.com/dotnet/windowsdesktop - b7b230f4687547192a2aaeb97859769a3baf6b02 + e5b713da049efd0da0559ee0012bcb86609b992f https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 129ce81522693d6ac03e51d05c025b030cfabd30 - + https://github.com/dotnet/winforms - 376191eec30f5fa0177e863ec7d0c688c6a04c6f + e75f8afc896be5b22deefb9120439e3970f136a3 - + https://github.com/dotnet/wpf - 1838a6b866902a21ba417705918dc19b8427b697 + ac70b3659d0b2577373821d8eed273dde7064986 diff --git a/eng/Versions.props b/eng/Versions.props index 55a987ba5..5a83ac4ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20173.1 + 5.0.0-preview.3.20173.2 - 5.0.0-preview.3.20173.1 + 5.0.0-preview.3.20173.2 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20173.1 - 5.0.0-preview.3.20173.1 - 5.0.0-preview.3.20173.1 + 5.0.0-preview.3.20173.2 + 5.0.0-preview.3.20173.2 + 5.0.0-preview.3.20173.2 From f613aecc9b168781c97db5310d23904c525bd943 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 07:30:55 +0000 Subject: [PATCH 97/98] Update dependencies from https://github.com/dotnet/sdk build 20200323.7 (#6900) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20173.7 - Microsoft.NET.Sdk - 5.0.100-preview.3.20173.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64ec1ada5..3c219f2c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 42b39532639ab11fd335961b262ea2620b12407c - + https://github.com/dotnet/sdk - 129ce81522693d6ac03e51d05c025b030cfabd30 + 56d321ecc8602ed89ef84a085cb0fd17be75a249 - + https://github.com/dotnet/sdk - 129ce81522693d6ac03e51d05c025b030cfabd30 + 56d321ecc8602ed89ef84a085cb0fd17be75a249 diff --git a/eng/Versions.props b/eng/Versions.props index 5a83ac4ea..041e6421b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20173.6 - 5.0.100-preview.3.20173.6 + 5.0.100-preview.3.20173.7 + 5.0.100-preview.3.20173.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e0c5ca077c49357dddea54a00e04cf6a6928f3a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 16:31:01 +0000 Subject: [PATCH 98/98] Update dependencies from https://github.com/dotnet/sdk build 20200324.1 (#6901) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20174.1 - Microsoft.NET.Sdk - 5.0.100-preview.3.20174.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c219f2c5..cccccbdd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 42b39532639ab11fd335961b262ea2620b12407c - + https://github.com/dotnet/sdk - 56d321ecc8602ed89ef84a085cb0fd17be75a249 + c7272154b12830d822c7414b5ed4c765b3c0c415 - + https://github.com/dotnet/sdk - 56d321ecc8602ed89ef84a085cb0fd17be75a249 + c7272154b12830d822c7414b5ed4c765b3c0c415 diff --git a/eng/Versions.props b/eng/Versions.props index 041e6421b..4c898e1cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.3.20173.7 - 5.0.100-preview.3.20173.7 + 5.0.100-preview.3.20174.1 + 5.0.100-preview.3.20174.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)