diff --git a/build-source-tarball.sh b/build-source-tarball.sh index 11eac499ef..1ba13922c3 100755 --- a/build-source-tarball.sh +++ b/build-source-tarball.sh @@ -161,6 +161,12 @@ cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/packages $TARBALL_ROOT cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/source $TARBALL_ROOT/reference-packages/source cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/staging $TARBALL_ROOT/reference-packages/staging +# some references packages have a mismatching public key which causes compile issues in the tarball. Remove these. +# see issue https://github.com/dotnet/source-build/issues/1186 +rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.0.0.nupkg +rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.3.0.nupkg +rm $TARBALL_ROOT/reference-packages/packages/System.Threading.Tasks.Extensions.4.5.2.nupkg + # Copy generated source from bin to src/generatedSrc cp -r $SCRIPT_ROOT/bin/obj/x64/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc diff --git a/dir.props b/dir.props index 6d55554475..be72a4108c 100644 --- a/dir.props +++ b/dir.props @@ -83,6 +83,7 @@ $(OutputPath) $(LocalBlobStorageRoot)Toolset/ $(LocalBlobStorageRoot)Runtime/ + $(LocalBlobStorageRoot)aspnetcore/Runtime/ $(IntermediatePath)TargetInfo.props $(IntermediatePath)RestoreSources.props $(IntermediatePath)PackageVersions.props diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfa4ab074d..15cffa8c38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,9 +43,9 @@ https://github.com/dotnet/core-setup d01b2fb7bc6bd4911e157fbd51353059a3ba1a6c - + https://github.com/aspnet/AspNetCore-Tooling - 3cbb59559b5c0488bab471c0b8c0f2ecf14d5767 + 408bbfd1898fee0581ee4c67d1f757b2dc468bd1 aspnetcore-tooling @@ -65,9 +65,9 @@ 27af96bdb7ba8d6d7ea9ad53fc76cd1d1aa80703 nuget-client - + https://github.com/aspnet/Extensions - dea3f207c8ea27f2a13ab15880df58ff91b42dfa + 898f6e9319f99bad6c917b22088144231db6c2c3 aspnet-extensions @@ -89,6 +89,11 @@ https://github.com/dotnet/xliff-tasks 173ee3bd61c9549557eefa3cfb718bdef157cb87 + + https://github.com/aspnet/AspNetCore + 4a42afc5aea63750638e118560d43db04bd9ccc2 + aspnetcore + https://github.com/dotnet/cli 1f3f34004a494b55121d05fd3d5e1ca7b0bb6a37 diff --git a/global.json b/global.json index 381fd70fcd..ae28928a2c 100644 --- a/global.json +++ b/global.json @@ -6,6 +6,7 @@ "Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.Traversal": "2.0.2", "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19359.6", + "Yarn.MSBuild": "1.15.2" } } diff --git a/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch b/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch new file mode 100644 index 0000000000..1fa89f2f6a --- /dev/null +++ b/patches/aspnetcore/0001-Exclude-analyzer-for-source-build.patch @@ -0,0 +1,25 @@ +From d72c7ab47fab69e2127083aeb029bae16438f6ae Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Fri, 26 Jul 2019 13:37:36 -0500 +Subject: [PATCH 1/4] Exclude analyzer for source-build. + +--- + Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 06e288aa81..6c07ec1582 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -87,7 +87,7 @@ + $(RuntimeInstallerBaseName)-internal + + +- ++ + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0002-Import-PackageVersions.props.patch b/patches/aspnetcore/0002-Import-PackageVersions.props.patch new file mode 100644 index 0000000000..1437f0bd33 --- /dev/null +++ b/patches/aspnetcore/0002-Import-PackageVersions.props.patch @@ -0,0 +1,26 @@ +From 401bac43ea2bf796046483f3f58a758a180a2e86 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Wed, 17 Jul 2019 17:20:48 -0500 +Subject: [PATCH 2/4] Import PackageVersions.props. + +--- + eng/Versions.props | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/eng/Versions.props b/eng/Versions.props +index a2f5ff40c9..c7d9bed81a 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -248,6 +248,9 @@ + $(XunitVersion) + 1.0.19189.1-Preview + ++ ++ ++ + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch new file mode 100644 index 0000000000..e7a4ffa7fc --- /dev/null +++ b/patches/aspnetcore/0003-Exclude-some-projects-from-source-build.patch @@ -0,0 +1,28 @@ +From 93d8a69b03abd855b56e9993ca90177f03021aaf Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 18 Jul 2019 01:34:30 -0500 +Subject: [PATCH 3/4] Exclude some projects from source-build. + +--- + Directory.Build.props | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 6c07ec1582..443f4b2797 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -18,9 +18,11 @@ + false + true + true ++ true + true + true + false ++ true + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0004-Add-default-for-_SuppressSdkImports.patch b/patches/aspnetcore/0004-Add-default-for-_SuppressSdkImports.patch new file mode 100644 index 0000000000..6b7fbadf3f --- /dev/null +++ b/patches/aspnetcore/0004-Add-default-for-_SuppressSdkImports.patch @@ -0,0 +1,24 @@ +From 05835b0f1ad27a315ff5a4281ff2b6b9c5698c25 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 18 Jul 2019 03:04:54 -0500 +Subject: [PATCH 4/4] Add default for _SuppressSdkImports? + +--- + Directory.Build.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 443f4b2797..1f36384bc5 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -3,6 +3,7 @@ + $(MSBuildThisFileDirectory) + https://github.com/aspnet/AspNetCore + git ++ <_SuppressSdkImports Condition="'$(_SuppressSdkImports)' == ''">false + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0005-Match-new-NuGet-MSBuild-version.patch b/patches/aspnetcore/0005-Match-new-NuGet-MSBuild-version.patch new file mode 100644 index 0000000000..b40a3e0a39 --- /dev/null +++ b/patches/aspnetcore/0005-Match-new-NuGet-MSBuild-version.patch @@ -0,0 +1,29 @@ +From f1f64f4e018f0e1071bbbd77a2a106ae5ef7c543 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Thu, 15 Aug 2019 16:38:08 -0500 +Subject: [PATCH 5/5] Match new NuGet MSBuild version. + +--- + eng/tools/RepoTasks/RepoTasks.csproj | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj +index 0bf6be98ae..7a669b85d5 100644 +--- a/eng/tools/RepoTasks/RepoTasks.csproj ++++ b/eng/tools/RepoTasks/RepoTasks.csproj +@@ -17,9 +17,9 @@ + + + +- +- +- ++ ++ ++ + + + +-- +2.18.0 + diff --git a/patches/aspnetcore/0006-Elevate-for-ulimit-on-OSX.patch b/patches/aspnetcore/0006-Elevate-for-ulimit-on-OSX.patch new file mode 100644 index 0000000000..596328c611 --- /dev/null +++ b/patches/aspnetcore/0006-Elevate-for-ulimit-on-OSX.patch @@ -0,0 +1,25 @@ +From fff33ea363b1e4221075cb0378fb3ff9730c1389 Mon Sep 17 00:00:00 2001 +From: Chris Rummel +Date: Fri, 16 Aug 2019 11:44:03 -0500 +Subject: [PATCH 6/6] Elevate for ulimit on OSX? + +--- + build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build.sh b/build.sh +index c170ac1844..a41626f0a7 100755 +--- a/build.sh ++++ b/build.sh +@@ -270,7 +270,7 @@ fi + + # increase file descriptor limit on macOS + if [ "$(uname)" = "Darwin" ]; then +- ulimit -n 10000 ++ sudo ulimit -n 10000 + fi + + # Import Arcade +-- +2.18.0 + diff --git a/patches/aspnetcore/0007-Add-a-package-for-source-build.patch b/patches/aspnetcore/0007-Add-a-package-for-source-build.patch new file mode 100644 index 0000000000..1ca7c54ae5 --- /dev/null +++ b/patches/aspnetcore/0007-Add-a-package-for-source-build.patch @@ -0,0 +1,25 @@ +From b1410d803f306572f6ee381df6648f016a445a22 Mon Sep 17 00:00:00 2001 +From: John Luo +Date: Fri, 16 Aug 2019 11:25:36 -0700 +Subject: [PATCH 7/7] Add a package for source build + +--- + .../Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +index b75277126a..922477578a 100644 +--- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj ++++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +@@ -7,6 +7,8 @@ + true + aspnetcore;aspnetcoremvc;razor + true ++ ++ false + + + +-- +2.18.0 + diff --git a/patches/core-sdk/0005-Exclude-test-project-from-source-build.patch b/patches/core-sdk/0002-Exclude-test-project-from-source-build.patch similarity index 93% rename from patches/core-sdk/0005-Exclude-test-project-from-source-build.patch rename to patches/core-sdk/0002-Exclude-test-project-from-source-build.patch index 27e4dd56f4..aab513da57 100644 --- a/patches/core-sdk/0005-Exclude-test-project-from-source-build.patch +++ b/patches/core-sdk/0002-Exclude-test-project-from-source-build.patch @@ -1,7 +1,7 @@ -From 0948b034f768c52748a118d65999dd099ee0af87 Mon Sep 17 00:00:00 2001 +From 908d68c90383a54c6075f8594f0d418b2bf861a0 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 20 Jun 2019 00:55:37 -0500 -Subject: [PATCH 5/5] Exclude test project from source-build +Subject: [PATCH 2/2] Exclude test project from source-build --- test/EndToEnd/EndToEnd.Tests.csproj | 1 + @@ -40,5 +40,5 @@ index a0d76c961..fa426d054 100644 \ No newline at end of file + -- -2.18.0 +2.21.0 diff --git a/patches/websdk/0001-Add-PVP-import.patch b/patches/websdk/0001-Add-PVP-import.patch index aa8185e1ea..234a60bdf2 100644 --- a/patches/websdk/0001-Add-PVP-import.patch +++ b/patches/websdk/0001-Add-PVP-import.patch @@ -1,17 +1,25 @@ -From 84ceae2fd066ef4a3fc8ac387fc7b4387a092cf9 Mon Sep 17 00:00:00 2001 +From 476758b37f846d66680a2f11e69b624ad149b24f Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 24 Jun 2019 17:02:08 -0500 Subject: [PATCH] Add PVP import. --- - eng/Versions.props | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + eng/Versions.props | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props -index fc6d26e..1eef302 100644 +index 4f22a7a..74563c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -24,7 +24,7 @@ +@@ -19,12 +19,15 @@ + 4.3.0 + 3.0.0-preview8.19405.7 + ++ ++ ++ + + 3.0.100 preview8 @@ -20,13 +28,6 @@ index fc6d26e..1eef302 100644 $(RestoreSources); https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json; -@@ -48,4 +48,6 @@ - 3.0.0-preview8.19405.7 - 3.0.0-preview8.19405.7 - -+ -+ - -- 2.21.0 diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj new file mode 100644 index 0000000000..cc1ad33a27 --- /dev/null +++ b/repos/aspnetcore.proj @@ -0,0 +1,80 @@ + + + + AspNetCore + + + + + + $(BuildCommandArgs) --restore --build --pack + $(BuildCommandArgs) --configuration $(Configuration) + $(BuildCommandArgs) --ci + $(BuildCommandArgs) -bl + + true + $(BuildCommandArgs) -v $(LogVerbosity) + + $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) + + $(ProjectDirectory)artifacts/installers/$(Configuration)/ + $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/ + $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ + false + true + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + + $(SourceBuiltPackagesPath) + $(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath) + $(EnvironmentRestoreSources)%3Bhttps://api.nuget.org/v3/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json + $(EnvironmentRestoreSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/repos/cli.proj b/repos/cli.proj index b6baa5cda5..5142846715 100644 --- a/repos/cli.proj +++ b/repos/cli.proj @@ -67,12 +67,6 @@ - - - - $(TargetRid.Substring(0, $(TargetRid.IndexOf("-")))) - /p:Rid=$(TargetRid) - /p:OSName=$(OSNameOverride) + /p:CoreSetupRid=linux-x64 /p:CoreSetupRid=osx-x64 $(BuildCommandArgs) -c $(Configuration) @@ -57,8 +55,7 @@ - - + @@ -70,10 +67,6 @@ - - - - $(TargetRid) - osx-x64 - $(PortableBuild) - true - - $(FlagParameterPrefix)restore $(FlagParameterPrefix)build - $(BuildArguments) $(FlagParameterPrefix)configuration $(Configuration) - $(BuildArguments) $(FlagParameterPrefix)ci - $(BuildArguments) /p:PortableBuild=$(OverridePortable) + --restore --build + $(BuildArguments) --configuration $(Configuration) + $(BuildArguments) --ci $(BuildArguments) /p:TargetArchitecture=$(Platform) /p:DisableCrossgen=true /p:CrossBuild=true $(BuildArguments) /p:BuildDebPackage=false $(BuildArguments) /p:BuildAllPackages=true $(BuildArguments) /p:RestoreAllBuildRids=false - $(BuildArguments) /p:OutputRid=$(OverrideTargetRid) $(BuildArguments) /p:PreReleaseLabel="$(PreReleaseVersionLabel)" $(BuildArguments) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index e60a8fb4b8..e2e47cc6fa 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -13,14 +13,11 @@ $(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE $(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE - - $(BuildArguments) -PortableBuild=false - $(BuildArguments) /bl $(BuildArguments) /p:ILLinkTrimAssembly=false $(BuildArguments) /p:CheckCDefines=false $(BuildArguments) /p:PackagesDir=$(PackagesDir) + $(BuildArguments) /p:ContinuousIntegrationBuild=true $(BuildArguments) -warnAsError:0 $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) diff --git a/repos/corefx.proj b/repos/corefx.proj index 346a6df56e..3a8f7465e1 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -5,21 +5,11 @@ $(ProjectDirectory)global.json - - $(PortableBuild) - true - $(TargetRid) - osx-x64 - win-x64 - $(FlagParameterPrefix)configuration $(Configuration) $(BuildArguments) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack $(BuildArguments) /p:SkipTests=true $(BuildArguments) /p:ArchGroup=$(Platform) $(BuildArguments) /p:ConfigurationGroup=$(Configuration) - $(BuildArguments) /p:PackageRid=$(OverrideTargetRid) - $(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-")))) - $(BuildArguments) /p:PortableBuild=$(OverridePortableBuild) $(BuildArguments) /p:ToolsDir=$(ToolsDir) $(BuildArguments) /p:EnableVSTestReferences=false $(BuildArguments) /p:ILLinkTrimAssembly=false diff --git a/repos/known-good.proj b/repos/known-good.proj index d526c2cc0d..691cb15c8f 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -69,6 +69,7 @@ + diff --git a/repos/toolset.proj b/repos/toolset.proj index 2188c3cbb8..2ada733945 100644 --- a/repos/toolset.proj +++ b/repos/toolset.proj @@ -60,8 +60,7 @@ - - + diff --git a/repos/websdk.proj b/repos/websdk.proj index df4010f87c..f5c9797339 100644 --- a/repos/websdk.proj +++ b/repos/websdk.proj @@ -34,7 +34,7 @@ - + diff --git a/smoke-test.sh b/smoke-test.sh index 64fa16dc14..14a6b3c6ba 100755 --- a/smoke-test.sh +++ b/smoke-test.sh @@ -6,7 +6,7 @@ TARBALL_PREFIX=dotnet-sdk- VERSION_PREFIX=3.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=2.1.0-rtm-30762 +DEV_CERTS_VERSION_DEFAULT=3.0.0-preview8-28405-07 __ROOT_REPO=$(cat "$SCRIPT_ROOT/bin/obj/rootrepo.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -136,13 +136,6 @@ function doCommand() { newArgs="new $proj -lang $lang" - # XXX temporary workaround XXX - # this is a temporary workaround before templates are updated to use netcoreapp3.0. - # see issue https://github.com/dotnet/source-build/issues/635 for more details. - # This part ensures packages won't fail to restore before we can edit the csproj. - newArgs="$newArgs --no-restore" - # XXX temporary workaround XXX - while :; do if [ $# -le 0 ]; then break @@ -259,17 +252,6 @@ function runAllTests() { fi } -function runWebTests() { - doCommand C# web "$@" new restore run - doCommand C# mvc "$@" new restore run - doCommand C# webapi "$@" new restore run - doCommand C# razor "$@" new restore run - - doCommand F# web "$@" new restore run - doCommand F# mvc "$@" new restore run - doCommand F# webapi "$@" new restore run -} - function resetCaches() { rm -rf "$testingHome" mkdir "$testingHome" @@ -360,14 +342,6 @@ fi export NUGET_PACKAGES="$restoredPackagesDir" SOURCE_BUILT_PKGS_PATH="$SCRIPT_ROOT/bin/obj/x64/$configuration/blob-feed/packages/" -# XXX temporary workaround XXX -# This is a temporary workaround to disable tests that will fail until ASP.NET packages are updated. -# See https://github.com/dotnet/source-build/issues/635 for more details. -echo "WARNING: Setting excludeWebTests and excludeOnlineTests to disable known-failing tests." | tee -a "$logFile" -excludeWebTests=true -excludeOnlineTests=true -# XXX temporary workaround XXX - # Run all tests, local restore sources first, online restore sources second if [ "$excludeLocalTests" == "false" ]; then resetCaches diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 95c60e4b05..fab8ac9cc0 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -6,6 +6,7 @@ + diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 46f32f31ae..18681d4ced 100644 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -3,9 +3,10 @@ src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ src/arcade.8f3c22397990aeb20a88690b51dad4b33f21e7ff/ - src/Extensions.dea3f207c8ea27f2a13ab15880df58ff91b42dfa/ + src/Extensions.898f6e9319f99bad6c917b22088144231db6c2c3/ src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - src/AspNetCore-Tooling.3cbb59559b5c0488bab471c0b8c0f2ecf14d5767/ + src/AspNetCore-Tooling.408bbfd1898fee0581ee4c67d1f757b2dc468bd1/ + src/AspNetCore.4a42afc5aea63750638e118560d43db04bd9ccc2/ src/cli.1f3f34004a494b55121d05fd3d5e1ca7b0bb6a37/ src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ @@ -120,13 +121,16 @@ + + + + - - + @@ -175,7 +179,8 @@ - + + @@ -260,9 +265,9 @@ - + - + @@ -274,11 +279,13 @@ - - + + + + @@ -292,37 +299,39 @@ - + - - - - + + + - - - + + + - - + + + + + \ No newline at end of file diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index bccbe3cc7c..901139c186 100755 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -3,9 +3,10 @@ bin/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/ bin/src/arcade.8f3c22397990aeb20a88690b51dad4b33f21e7ff/ - bin/src/Extensions.dea3f207c8ea27f2a13ab15880df58ff91b42dfa/ + bin/src/Extensions.898f6e9319f99bad6c917b22088144231db6c2c3/ bin/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/ - bin/src/AspNetCore-Tooling.3cbb59559b5c0488bab471c0b8c0f2ecf14d5767/ + bin/src/AspNetCore-Tooling.408bbfd1898fee0581ee4c67d1f757b2dc468bd1/ + bin/src/AspNetCore.4a42afc5aea63750638e118560d43db04bd9ccc2/ bin/src/cli.1f3f34004a494b55121d05fd3d5e1ca7b0bb6a37/ bin/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/ bin/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/ @@ -46,10 +47,15 @@ + + + + + @@ -60,8 +66,7 @@ - - + @@ -105,7 +110,7 @@ - + @@ -117,7 +122,7 @@ - + @@ -226,7 +231,8 @@ - + + @@ -371,7 +377,7 @@ - + @@ -379,7 +385,7 @@ - + @@ -407,8 +413,8 @@ - - + + @@ -422,6 +428,7 @@ + @@ -444,6 +451,7 @@ + @@ -507,7 +515,7 @@ - + @@ -526,7 +534,6 @@ - @@ -535,21 +542,21 @@ - + - + - + - + @@ -558,7 +565,7 @@ - + @@ -568,7 +575,7 @@ - + @@ -576,14 +583,14 @@ - - + + - + @@ -595,11 +602,9 @@ - - - + @@ -613,7 +618,7 @@ - + @@ -626,9 +631,10 @@ - + + - + @@ -640,5 +646,6 @@ + - \ No newline at end of file + diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs index c9982e03de..768c25ec1d 100644 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WriteBuildOutputProps.cs @@ -86,7 +86,9 @@ public override bool Execute() foreach (PackageIdentity packageIdentity in latestPackages) { string propertyName = GetPropertyName(packageIdentity.Id); + sw.WriteLine($" <{propertyName}>{packageIdentity.Version}"); + propertyName = GetAlternatePropertyName(packageIdentity.Id); sw.WriteLine($" <{propertyName}>{packageIdentity.Version}"); } foreach (var extraProp in ExtraProperties ?? Enumerable.Empty()) @@ -120,5 +122,15 @@ public static string GetPropertyName(string id) return $"{formattedId}PackageVersion"; } + + public static string GetAlternatePropertyName(string id) + { + string formattedId = InvalidElementNameCharRegex.Replace( + id, + match => match.Groups?["FirstPartChar"].Value.ToUpperInvariant() + ?? string.Empty); + + return $"{formattedId}Version"; + } } }