Skip to content

Commit 642dbff

Browse files
authored
Revert a few version updates that weren't required (keeping the preview updates). Remove the binlog publishing since that already exists. Fix the dmp upload on non-windows.
1 parent 3c6490c commit 642dbff

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<Project Sdk="Microsoft.VisualStudio.JavaScript.SDK/1.0.3398286" />
1+
<Project Sdk="Microsoft.VisualStudio.JavaScript.SDK/1.0.1948920" />

test/UnitTests.proj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@
137137
<HelixPreCommands Condition="$(IsPosixShell)">. $HELIX_CORRELATION_PAYLOAD/t/RunTestsOnHelix.sh;$(HelixPreCommands)</HelixPreCommands>
138138
<HelixPostCommands Condition="!$(IsPosixShell)">PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure";$(HelixPostCommands)</HelixPostCommands>
139139
<HelixPostCommands Condition="!$(IsPosixShell)">PowerShell -ExecutionPolicy ByPass "Get-ChildItem -Recurse -File -Filter '*hangdump.dmp' | Copy-Item -Destination $env:HELIX_WORKITEM_UPLOAD_ROOT";$(HelixPostCommands)</HelixPostCommands>
140-
<HelixPostCommands Condition="!$(IsPosixShell)">PowerShell -ExecutionPolicy ByPass "Get-ChildItem -Path $env:HELIX_WORKITEM_PAYLOAD -Recurse -File -Filter 'helixfailure.binlog' | Copy-Item -Destination $env:HELIX_WORKITEM_UPLOAD_ROOT";$(HelixPostCommands)</HelixPostCommands>
141-
<HelixPostCommands Condition="$(IsPosixShell)">find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands)</HelixPostCommands>
142-
<HelixPostCommands Condition="$(IsPosixShell)">find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*helixfailure.binlog' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands)</HelixPostCommands>
140+
<HelixPostCommands Condition="$(IsPosixShell)">find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \;;$(HelixPostCommands)</HelixPostCommands>
143141
<TestDotnetVersion>$(Version)</TestDotnetVersion>
144142
<MSBuildSdkResolverDir>$(RepoRoot)artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverDir>
145143
<HelixStage0Targz>$(RepoRoot)artifacts\tmp\HelixStage0.tar.gz</HelixStage0Targz>

test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,8 +1748,8 @@ public void SdkReference()
17481748
var testInstance = _testAssetsManager.CreateTestDirectory();
17491749
File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), """
17501750
#:sdk Microsoft.NET.Sdk
1751-
#:sdk Aspire.AppHost.Sdk@9.3.1
1752-
#:package Aspire.Hosting.AppHost@9.3.1
1751+
#:sdk Aspire.AppHost.Sdk@9.2.1
1752+
#:package Aspire.Hosting.AppHost@9.2.1
17531753
17541754
var builder = DistributedApplication.CreateBuilder(args);
17551755
builder.Build().Run();

0 commit comments

Comments
 (0)