Skip to content

Commit a811f78

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Backflow from https://github.com/dotnet/dotnet / 8cb85e0 build 278022
[[ commit created by automation ]]
1 parent f0b40be commit a811f78

File tree

7 files changed

+23
-16
lines changed

7 files changed

+23
-16
lines changed

‎Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@
7878
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7979
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
8080
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" />
81-
<PackageVersion Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetVersion)" />
82-
<PackageVersion Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetVersion)" />
83-
<PackageVersion Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetVersion)" />
84-
<PackageVersion Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetVersion)" />
85-
<PackageVersion Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetVersion)" />
81+
<PackageVersion Include="Microsoft.WixToolset.Bal.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
82+
<PackageVersion Include="Microsoft.WixToolset.Dependency.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
83+
<PackageVersion Include="Microsoft.WixToolset.Heat" Version="$(MicrosoftWixToolsetSdkVersion)" />
84+
<PackageVersion Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
85+
<PackageVersion Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
8686
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
8787
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
8888
<PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />

‎src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ internal sealed class CompilationHandler : IDisposable
3737

3838
private bool _isDisposed;
3939

40-
static CompilationHandler()
41-
{
42-
WatchHotReloadService.RequireCommit = true;
43-
}
44-
4540
public CompilationHandler(IReporter reporter, ProcessRunner processRunner)
4641
{
4742
_reporter = reporter;

‎src/Layout/redist/redist.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@
7373
<ProjectReference Include="$(RepoRoot)template_feed\*\*.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
7474
</ItemGroup>
7575

76-
<ItemGroup>
77-
<ProjectReference Include="..\finalizer\finalizer.csproj" Condition="'$(OS)' == 'Windows_NT'" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
76+
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
77+
<ProjectReference Include="..\pkg\windows\bundles\sdk\bundle.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Condition="'$(MSBuildRestoreSessionId)' != ''" />
78+
<ProjectReference Include="..\finalizer\finalizer.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" Private="false" />
7879
</ItemGroup>
7980

8081
<!-- In .NET product build mode, explicitly build workloads in build pass 2.

‎src/Workloads/VSInsertion/workloads.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,15 @@
9595
</ItemGroup>
9696

9797
<ItemGroup Condition="'$(BuildWorkloads)' == 'true'">
98+
<!-- we use MicrosoftNETCoreAppRuntimePackageVersion for both runtime and emsdk packages since they're aligned in VMR builds -->
9899
<PackageDownload Include="@(RuntimeWorkloadPacksToDownload)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
99-
<PackageDownload Include="@(EmsdkWorkloadPacksToDownload)" Version="[$(MicrosoftNETRuntimeEmscripten3156Cachewinx64Version)]" />
100+
<PackageDownload Include="@(EmsdkWorkloadPacksToDownload)" Version="[$(MicrosoftNETCoreAppRuntimePackageVersion)]" />
100101
</ItemGroup>
101102

102103
<Target Name="_CollectDownloadedWorkloadPacks">
103104
<ItemGroup>
104105
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(RuntimeWorkloadPacksToDownload.Identity)\$(MicrosoftNETCoreAppRuntimePackageVersion)\*.nupkg" />
105-
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(EmsdkWorkloadPacksToDownload.Identity)\$(MicrosoftNETRuntimeEmscripten3156Cachewinx64Version)\*.nupkg" />
106+
<DownloadedWorkloadPacks Include="$(NuGetPackageRoot)\%(EmsdkWorkloadPacksToDownload.Identity)\$(MicrosoftNETCoreAppRuntimePackageVersion)\*.nupkg" />
106107
</ItemGroup>
107108

108109
<Copy SourceFiles="@(DownloadedWorkloadPacks)"

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void Build60Hosted_Works()
4444
new FileInfo(Path.Combine(serverBuildOutputDirectory, $"{testAsset}.Shared.dll")).Should().Exist();
4545
}
4646

47-
[WindowsOnlyRequiresMSBuildVersionFact("17.13", Reason = "Needs System.Text.Json 8.0.5")] // https://github.com/dotnet/sdk/issues/44886
47+
[WindowsOnlyRequiresMSBuildVersionFact("17.13", Reason = "Needs System.Text.Json 8.0.5", Skip = "https://github.com/dotnet/sdk/issues/49925")] // https://github.com/dotnet/sdk/issues/44886
4848
[SkipOnPlatform(TestPlatforms.Linux | TestPlatforms.OSX, "https://github.com/dotnet/sdk/issues/42145")]
4949
public void Publish60Hosted_Works()
5050
{

‎test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public BuildWithComponentsIntegrationTest(ITestOutputHelper log) : base(log) { }
1212
[CoreMSBuildOnlyFact]
1313
public void Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks();
1414

15-
[RequiresMSBuildVersionFact("17.10.0.8101")]
15+
[RequiresMSBuildVersionFact("17.10.0.8101", Skip = "https://github.com/dotnet/sdk/issues/49925")]
1616
public void Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks();
1717

1818
[Fact]

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,16 @@ Release config
225225
Hello from Program
226226
Release config
227227
""");
228+
229+
new DotnetCommand(Log, "Program.cs", "arg1", "arg2")
230+
.WithWorkingDirectory(testInstance.Path)
231+
.Execute()
232+
.Should().Pass()
233+
.And.HaveStdOut("""
234+
echo args:arg1;arg2
235+
Hello from Program
236+
Release config
237+
""");
228238
}
229239

230240
/// <summary>

0 commit comments

Comments
 (0)