Skip to content

Commit 2a6bbb5

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
revert the backflow code changes
1 parent 7df2da8 commit 2a6bbb5

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

src/Layout/pkg/dotnet-sdk.proj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
99
<BuildDebPackage Condition="'$(BuildSdkDeb)' == 'true'">true</BuildDebPackage>
1010
<BuildRpmPackage Condition="'$(BuildSdkRpm)' == 'true'">true</BuildRpmPackage>
11+
<UseArcadeRpmTooling>true</UseArcadeRpmTooling>
1112
<ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
1213
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
1314
<InstallerName>dotnet-sdk</InstallerName>
@@ -110,7 +111,7 @@
110111
</Target>
111112

112113
<Target Name="AddLinuxPackageInformation"
113-
BeforeTargets="GetAdditionalLinuxInstallerProperties"
114+
BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties"
114115
DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
115116

116117
<PropertyGroup>

src/Layout/redist/redist.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Microsoft.Build.NuGetSdkResolver" />
3030
<PackageReference Include="Microsoft.TestPlatform.CLI" ExcludeAssets="All" />
3131
<PackageReference Include="Microsoft.TestPlatform.Build" />
32-
<PackageReference Include="NuGet.Localization" />
32+
<PackageReference Condition=" '$(DotNetBuildSourceOnly)' != 'true' " Include="NuGet.Localization" />
3333
<PackageReference Include="NuGet.ProjectModel" />
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />
3535
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,16 @@ Release config
248248
Hello from Program
249249
Release config
250250
""");
251+
252+
new DotnetCommand(Log, "Program.cs", "arg1", "arg2")
253+
.WithWorkingDirectory(testInstance.Path)
254+
.Execute()
255+
.Should().Pass()
256+
.And.HaveStdOut("""
257+
echo args:arg1;arg2
258+
Hello from Program
259+
Release config
260+
""");
251261
}
252262

253263
/// <summary>

0 commit comments

Comments
 (0)