Skip to content

Commit 4c1beb7

Browse files
javiercnjaviercn
authored
Merge branch 'javiercn/reuse-original-task-item-for-unmodified-assets-and-endpoints' into javiercn/more-cleanups
2 parents 3e6cc08 + 7445214 commit 4c1beb7

File tree

9 files changed

+24
-34
lines changed

9 files changed

+24
-34
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,14 @@
453453
<Uri>https://github.com/dotnet/wpf</Uri>
454454
<Sha>5f736908d28c09c43f167583f93c13dbc6521f61</Sha>
455455
</Dependency>
456-
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
456+
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25181.1">
457457
<Uri>https://github.com/dotnet/xdt</Uri>
458-
<Sha>1156b9aac00609107c21cf3458b797c76db6be7a</Sha>
458+
<Sha>e5485e65ae109d5dfb9a9e257776e6911ee1029d</Sha>
459459
</Dependency>
460460
<!-- Intermediate is necessary for source build. -->
461-
<Dependency Name="Microsoft.SourceBuild.Intermediate.xdt" Version="10.0.0-preview.25067.1">
461+
<Dependency Name="Microsoft.SourceBuild.Intermediate.xdt" Version="10.0.0-preview.25181.1">
462462
<Uri>https://github.com/dotnet/xdt</Uri>
463-
<Sha>1156b9aac00609107c21cf3458b797c76db6be7a</Sha>
463+
<Sha>e5485e65ae109d5dfb9a9e257776e6911ee1029d</Sha>
464464
<SourceBuild RepoName="xdt" ManagedOnly="true" />
465465
</Dependency>
466466
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25177.1">
@@ -715,13 +715,13 @@
715715
<Uri>https://github.com/dotnet/runtime</Uri>
716716
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
717717
</Dependency>
718-
<Dependency Name="Microsoft.Testing.Platform" Version="1.7.0-preview.25176.2">
718+
<Dependency Name="Microsoft.Testing.Platform" Version="1.7.0-preview.25181.5">
719719
<Uri>https://github.com/microsoft/testfx</Uri>
720-
<Sha>2712009db11c6b24c0b691b4dc9937657e8a9af4</Sha>
720+
<Sha>1b87ef2653cc93790dbaf192e831468714a70da9</Sha>
721721
</Dependency>
722-
<Dependency Name="MSTest" Version="3.9.0-preview.25176.2">
722+
<Dependency Name="MSTest" Version="3.9.0-preview.25181.5">
723723
<Uri>https://github.com/microsoft/testfx</Uri>
724-
<Sha>2712009db11c6b24c0b691b4dc9937657e8a9af4</Sha>
724+
<Sha>1b87ef2653cc93790dbaf192e831468714a70da9</Sha>
725725
</Dependency>
726726
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.4.25174.9">
727727
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3131
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3232
<!-- This property is only used in the dotnet test integration tests. -->
33-
<MicrosoftTestingPlatformVersion>1.7.0-preview.25176.2</MicrosoftTestingPlatformVersion>
33+
<MicrosoftTestingPlatformVersion>1.7.0-preview.25181.5</MicrosoftTestingPlatformVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Servicing version information">
3636
<VersionFeature21>30</VersionFeature21>
@@ -50,7 +50,7 @@
5050
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
5151
</PropertyGroup>
5252
<PropertyGroup Label="Production dependencies">
53-
<MicrosoftWebXdtPackageVersion>10.0.0-preview.25067.1</MicrosoftWebXdtPackageVersion>
53+
<MicrosoftWebXdtPackageVersion>10.0.0-preview.25181.1</MicrosoftWebXdtPackageVersion>
5454
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
5555
<MicrosoftApplicationInsightsPackageVersion>2.22.0</MicrosoftApplicationInsightsPackageVersion>
5656
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
@@ -295,7 +295,7 @@
295295
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
296296
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
297297
<MoqPackageVersion>4.18.4</MoqPackageVersion>
298-
<MSTestVersion>3.9.0-preview.25176.2</MSTestVersion>
298+
<MSTestVersion>3.9.0-preview.25181.5</MSTestVersion>
299299
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
300300
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
301301
</PropertyGroup>

‎eng/pipelines/templates/stages/vmr-validation.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ stages:
7373
- template: ../steps/vmr-validate-installers.yml
7474
parameters:
7575
targetArchitecture: x64
76-
continueOnError: true
7776
OS: Linux
7877
- job: ValidateInstallers_Linux_arm64
7978
displayName: Validate Installers - Linux arm64
@@ -83,7 +82,6 @@ stages:
8382
- template: ../steps/vmr-validate-installers.yml
8483
parameters:
8584
targetArchitecture: arm64
86-
continueOnError: true
8785
OS: Linux
8886
- ${{ if eq(variables.signEnabled, 'true') }}:
8987
- job: ValidateSigning_Windows

‎eng/pipelines/templates/steps/vmr-validate-installers.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
parameters:
2-
- name: continueOnError
3-
type: boolean
4-
default: false
5-
62
- name: targetArchitecture
73
type: string
84
default: ''
@@ -52,7 +48,6 @@ steps:
5248
$extraBuildProperties
5349
displayName: Validate installer packages
5450
workingDirectory: $(Build.SourcesDirectory)
55-
continueOnError: ${{ parameters.continueOnError }}
5651
5752
- task: PublishTestResults@2
5853
displayName: Publish Test Results

‎src/Layout/redist/targets/GeneratePKG.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- Properties for pkg build -->
88
<SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.$(TargetArchitecture)</SharedHostComponentId>
99
<HostFxrComponentId>com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.$(TargetArchitecture)</HostFxrComponentId>
10-
<SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.$(TargetArchitecture)</SharedFrameworkComponentId>
10+
<SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppRuntimePackageVersion).component.osx.$(TargetArchitecture)</SharedFrameworkComponentId>
1111
<NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppRefPackageVersion).component.osx.$(TargetArchitecture)</NetCoreAppTargetingPackComponentId>
1212
<NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(MicrosoftNETCoreAppHostPackageVersion).component.osx.$(TargetArchitecture)</NetCoreAppHostPackComponentId>
1313
<NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.$(TargetArchitecture)</NetStandardTargetingPackComponentId>

‎test/TestAssets/TestProjects/HybridTestRunnerTestProjects/AnotherTestProject/AnotherTestProject.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13-
<PackageReference Include="MSTest" Version="@(MSTestVersion)" />
12+
<PackageReference Include="MSTest" Version="$(MSTestVersion)" />
1413
</ItemGroup>
1514

1615
<ItemGroup>

‎test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public class DummyTestAdapter : ITestFramework, IDataProducer
3030
public Type[] DataTypesProduced => new[] {
3131
typeof(TestNodeUpdateMessage),
3232
typeof(SessionFileArtifact),
33-
typeof(TestNodeFileArtifact),
3433
typeof(FileArtifact), };
3534

3635
public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
@@ -94,13 +93,13 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context)
9493

9594
await context.MessageBus.PublishAsync(this, new SessionFileArtifact(context.Request.Session.SessionUid, new FileInfo("sessionFile.txt"), "sessionFile", "description"));
9695

97-
await context.MessageBus.PublishAsync(this, new TestNodeFileArtifact(context.Request.Session.SessionUid, new TestNode()
96+
await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
9897
{
9998
Uid = "Test6 id",
10099
DisplayName = "Test6",
101-
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
102-
}, new FileInfo("testNodeFile.txt"), "testNodeFile", "description"));
103-
//await Task.CompletedTask;
100+
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK"), new FileArtifactProperty(new FileInfo("testNodeFile.txt"), "testNodeFile", "description")),
101+
}));
102+
104103
context.Complete();
105104
}
106-
}
105+
}

‎test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/TestProject/Program.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class DummyTestAdapter : ITestFramework, IDataProducer
3434
public Type[] DataTypesProduced => new[] {
3535
typeof(TestNodeUpdateMessage),
3636
typeof(SessionFileArtifact),
37-
typeof(TestNodeFileArtifact),
3837
typeof(FileArtifact), };
3938

4039
public Task<CreateTestSessionResult> CreateTestSessionAsync(CreateTestSessionContext context)
@@ -91,13 +90,13 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context)
9190

9291
await context.MessageBus.PublishAsync(this, new SessionFileArtifact(context.Request.Session.SessionUid, new FileInfo("sessionFile.txt"), "sessionFile", "description"));
9392

94-
await context.MessageBus.PublishAsync(this, new TestNodeFileArtifact(context.Request.Session.SessionUid, new TestNode()
93+
await context.MessageBus.PublishAsync(this, new TestNodeUpdateMessage(context.Request.Session.SessionUid, new TestNode()
9594
{
9695
Uid = "Test6 id",
9796
DisplayName = "Test6",
98-
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK")),
99-
}, new FileInfo("testNodeFile.txt"), "testNodeFile", "description"));
97+
Properties = new PropertyBag(new PassedTestNodeStateProperty("OK"), new FileArtifactProperty(new FileInfo("testNodeFile.txt"), "testNodeFile", "description")),
98+
}));
10099

101100
context.Complete();
102101
}
103-
}
102+
}

‎test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestsWithArtifacts.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void RunTestProjectWithFailingTestsAndFileArtifacts_ShouldReturnExitCodeG
3636

3737
result.StdOut
3838
.Should().Contain("Test run summary: Failed!")
39-
.And.Contain("total: 6")
40-
.And.Contain("succeeded: 1")
39+
.And.Contain("total: 7")
40+
.And.Contain("succeeded: 2")
4141
.And.Contain("failed: 4")
4242
.And.Contain("skipped: 1");
4343
}

0 commit comments

Comments
 (0)