Skip to content

Commit 26704a0

Browse files
authored
Merge branch 'main' into darc-main-4f479765-a738-4e88-9c78-ae17d38cf431
2 parents ad580cd + 265d237 commit 26704a0

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.vsts-ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ parameters:
2121
- name: runTestBuild
2222
displayName: Run A Test Build
2323
type: boolean
24-
default: false
24+
default: true
2525
- name: enableArm64Job
2626
displayName: Enables the ARM64 job
2727
type: boolean
@@ -290,15 +290,16 @@ extends:
290290
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
291291

292292
############### PUBLISH STAGE ###############
293-
- ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
293+
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
294294
- stage: publish
295295
displayName: Publish
296-
dependsOn: build
296+
dependsOn: []
297297
jobs:
298298
- template: /eng/common/templates-official/job/publish-build-assets.yml@self
299299
parameters:
300300
publishUsingPipelines: true
301301
publishAssetsImmediately: true
302+
isAssetlessBuild: true
302303
pool:
303304
name: $(DncEngInternalBuildPool)
304305
image: 1es-windows-2022

test/dotnet-new.IntegrationTests/DotnetNewSearchTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ public void CanFilterAuthor(string testCase)
220220
Assert.True(AtLeastOneRowIsNotEmpty(tableOutput, "Downloads"), "'Downloads' column contains empty values");
221221
}
222222

223-
[Theory]
223+
#pragma warning disable xUnit1004
224+
[Theory(Skip = "https://github.com/dotnet/sdk/issues/49123")]
225+
#pragma warning restore xUnit1004
224226
[InlineData("--search --columns author --author micro")]
225227
[InlineData("search --columns author --author micro")]
226228
public void CanFilterAuthor_WithoutName(string testCase)

0 commit comments

Comments
 (0)