diff --git a/Tests.sln b/Tests.sln.off similarity index 100% rename from Tests.sln rename to Tests.sln.off diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcccbcfd8e05fb3d421715c22b5715d986dcf984..2c0b57414871e5905694724e79fc0ce98742368f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ - + https://github.com/dotnet/arcade - b1f9e12fe3ee71c48ea60b15968745850ac0a4a7 + 63b76f3f952f821d0a7996427a9f3534f1c25ab7 - + https://github.com/dotnet/arcade - b1f9e12fe3ee71c48ea60b15968745850ac0a4a7 + 63b76f3f952f821d0a7996427a9f3534f1c25ab7 diff --git a/eng/Versions.props b/eng/Versions.props index 87eef1fadda32f913083966561f5ae0495b1c431..934277a256a336d3a6f2609e79b67381b2d787d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 4.6.0-preview4.19208.6 4.6.0-preview4.19208.6 - 1.0.0-beta.19207.1 + 1.0.0-beta.19209.2 0.1.0-preview2-181205-2 diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets index 6544fe441ce071ecb598a6346b86acff9e668db5..6f1ba6818d9090ea3c10270b0e16f05c62ae6729 100644 --- a/eng/WpfArcadeSdk/tools/SdkReferences.targets +++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets @@ -22,7 +22,7 @@ <_netCoreAppSdkReference Remove="@(_netCoreAppSdkReference)" /> - <_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App'"/> + <_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App' Or '%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App.Ref'"/> diff --git a/eng/common/PublishToSymbolServers.proj b/eng/common/PublishToSymbolServers.proj index 36c08f0ea492b6dd67ec166bfb496c28277caf93..5d55e312b0122f1066f1fcb85b73ff7f46555ab9 100644 --- a/eng/common/PublishToSymbolServers.proj +++ b/eng/common/PublishToSymbolServers.proj @@ -24,6 +24,14 @@ + + + + diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index 211967debab51613e905a0f3f673e93ad1b7d359..a0a8074282aa86acd4dee506448ef710b8d5c195 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -5,6 +5,7 @@ parameters: condition: succeeded() continueOnError: false runAsPublic: false + publishUsingPipelines: false phases: - phase: Asset_Registry_Publish displayName: Publish to Build Asset Registry @@ -36,6 +37,7 @@ phases: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index f20ee78661c2e56102bebdbf60e7ee4b1554f368..9a319a1aa00aa5e7449e8ebdba3064951a9fc4b3 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { "tools": { - "dotnet": "3.0.100-preview-010024", + "dotnet": "3.0.100-preview4-011144", "vs": { "version": "16.0" } }, "sdk": { - "version": "3.0.100-preview-010024" + "version": "3.0.100-preview4-011144" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19207.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.2" }, "native-tools": { "strawberry-perl": "5.28.1.1-1",