From fd471128660d018bc5489d5fd95e51068ebfda90 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 30 Jan 2019 18:38:56 -0800 Subject: [PATCH 1/4] Remove target to print MCUrl now that helix sdk always prints it --- eng/sendtohelix.proj | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj index 2fe46f5b5a5e..05209023b94a 100644 --- a/eng/sendtohelix.proj +++ b/eng/sendtohelix.proj @@ -122,17 +122,4 @@ - - - - <_McUser>dotnet-mc-bot-2 - <_McHelixType>$([System.String]::Copy('$(HelixType)').ToLowerInvariant().Replace('/', '~2F')) - <_McHelixSource>$([System.String]::Copy('$(HelixSource)').ToLowerInvariant().Replace('/', '~2F')) - <_McUrl>https://mc.dot.net/#/user/$(_McUser)/$(_McHelixSource)/$(_McHelixType)/$(OfficialBuildId) - - - - From 651a50eb350086e047ca7e6292b108f83d77e0ee Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 30 Jan 2019 18:42:40 -0800 Subject: [PATCH 2/4] Run darc update for dotnet/arcade --- eng/Version.Details.xml | 48 ++++++++++---------- eng/Versions.props | 20 ++++---- eng/common/templates/steps/send-to-helix.yml | 4 +- global.json | 4 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51b6c178cf4e..3c1756b7a7f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,57 +26,57 @@ https://github.com/dotnet/coreclr 81e12aaff1d8671f1e7709afa3183458eaa79673 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 https://github.com/dotnet/standard 59e16d29c96343a15d818cd4eed57a348937ddfd - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - f1cfa4893337c329834c42c997b1e3d8a05f9d6a + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 268dc10408d39b6059924989a071549371757fb1 + 14d1133b6074b463784a7adbbf385df0462f4010 - + https://github.com/dotnet/arcade - 0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a + 14d1133b6074b463784a7adbbf385df0462f4010 diff --git a/eng/Versions.props b/eng/Versions.props index 99d4ff2f3332..83687f863f39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,16 +16,16 @@ - 1.0.0-beta.19078.1 - 1.0.0-beta.19078.1 - 1.0.0-beta.19078.1 - 1.0.0-beta.19078.1 - 1.0.0-beta.19078.1 - 2.4.0-beta.19078.1 - 1.0.0-beta.19078.1 - 1.0.0-beta.19079.3 - 1.0.0-beta.19079.6 - 2.2.0-beta.19078.1 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 2.4.0-beta.19080.6 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 1.0.0-beta.19080.6 + 2.2.0-beta.19080.6 3.0.0-preview-27329-4 3.0.0-preview-27329-4 diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index a5835c0f4738..1fbf8b889732 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -25,7 +25,7 @@ parameters: continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: Send job to Helix (Windows) env: BuildConfig: $(_BuildConfig) @@ -52,7 +52,7 @@ steps: Creator: ${{ parameters.Creator }} condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: Send job to Helix (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/global.json b/global.json index 79ed70e8619a..961c68055b1b 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "2.1.401" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19078.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19078.1", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19080.6", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19080.6", "Microsoft.NET.Sdk.IL": "3.0.0-preview-27330-71" } } From c50049c61712d703ff619327edee906fec474ef0 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 30 Jan 2019 18:45:01 -0800 Subject: [PATCH 3/4] Run darc update for dotnet\coreclr --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c1756b7a7f3..86c30e80a8bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,17 +14,17 @@ https://github.com/dotnet/core-setup 988132f2a89decd7203d665d26df53bc1c8f9eec - + https://github.com/dotnet/coreclr - 81e12aaff1d8671f1e7709afa3183458eaa79673 + 1b43bd8139d053e24ec51c193054555e3352371a - + https://github.com/dotnet/coreclr - 81e12aaff1d8671f1e7709afa3183458eaa79673 + 1b43bd8139d053e24ec51c193054555e3352371a - + https://github.com/dotnet/coreclr - 81e12aaff1d8671f1e7709afa3183458eaa79673 + 1b43bd8139d053e24ec51c193054555e3352371a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 83687f863f39..cb8fff76d050 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,8 +31,8 @@ 3.0.0-preview-27329-4 3.0.0-preview-27329-4 - 3.0.0-preview-27330-71 - 3.0.0-preview-27330-71 + 3.0.0-preview-27330-72 + 3.0.0-preview-27330-72 2.1.0-prerelease.19074.3 diff --git a/global.json b/global.json index 961c68055b1b..8dc477e79573 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19080.6", "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19080.6", - "Microsoft.NET.Sdk.IL": "3.0.0-preview-27330-71" + "Microsoft.NET.Sdk.IL": "3.0.0-preview-27330-72" } } From c8c5a7c6076e896f9a4f4248643983751ba4d42a Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 30 Jan 2019 22:52:19 -0800 Subject: [PATCH 4/4] Fix build after Environment pushed down to coreclr --- .../System.Diagnostics.Debug.Tests.csproj | 1 + .../src/System.Runtime.Extensions.csproj | 30 +++++++++++-------- .../src/System.Runtime.WindowsRuntime.csproj | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index ccc07a1d34bc..ef4c5196dc6e 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -10,6 +10,7 @@ + diff --git a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj index 279acd3fb0ea..0e607a8f3b7e 100644 --- a/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj +++ b/src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj @@ -21,17 +21,8 @@ - - - - - Common\CoreLib\System\OperatingSystem.cs - - - Common\CoreLib\System\PlatformID.cs - @@ -72,14 +63,29 @@ CoreLib\System\Text\ValueStringBuilder.cs - + + + + + + + Common\CoreLib\System\OperatingSystem.cs + + + Common\CoreLib\System\PlatformID.cs + + + + + + + Common\CoreLib\System\WinRTFolderPaths.cs - Common\Interop\Windows\secur32\Interop.GetUserNameExW.cs @@ -92,7 +98,6 @@ Common\CoreLib\System\PasteArguments.Windows.cs - @@ -179,7 +184,6 @@ - diff --git a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj index 439e80515dee..1593eb85badc 100644 --- a/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj +++ b/src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj @@ -9,7 +9,7 @@ $(NoWarn);1698;0436 {844A2A0B-4169-49C3-B367-AFDC4894E487} netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release - $(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY + $(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY $(DefineConstants);netstandard;FEATURE_APPX