Skip to content

Commit fb28721

Browse files
Backflow from https://github.com/dotnet/dotnet / 670981c build 279601
[[ commit created by automation ]]
1 parent b4882e0 commit fb28721

File tree

5 files changed

+4
-15
lines changed

5 files changed

+4
-15
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup Label="Manually updated">
128128
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
129-
<MicrosoftBuildLocatorPackageVersion>1.6.10</MicrosoftBuildLocatorPackageVersion>
129+
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
130130
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
131131
</PropertyGroup>
132132
<!-- Get .NET Framework reference assemblies from NuGet packages -->

src/Layout/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
because it is large (100MB+). -->
5858
<_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx'
5959
and !('$(OSName)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true</_IsCommunityPlatform>
60-
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$( _IsCommunityPlatform )' == 'true'">true</BundleCrossgen2>
60+
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(_IsCommunityPlatform)' == 'true'">true</BundleCrossgen2>
6161

6262
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
6363
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(TargetRid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>

src/Layout/pkg/dotnet-sdk.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
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>
1211
<ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
1312
<LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
1413
<InstallerName>dotnet-sdk</InstallerName>
@@ -111,7 +110,7 @@
111110
</Target>
112111

113112
<Target Name="AddLinuxPackageInformation"
114-
BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties"
113+
BeforeTargets="GetAdditionalLinuxInstallerProperties"
115114
DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
116115

117116
<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 Condition=" '$(DotNetBuildSourceOnly)' != 'true' " Include="NuGet.Localization" />
32+
<PackageReference Include="NuGet.Localization" />
3333
<PackageReference Include="NuGet.ProjectModel" />
3434
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" ExcludeAssets="All" GeneratePathProperty="true" />
3535
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" ExcludeAssets="All" GeneratePathProperty="true" />

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,6 @@ 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-
""");
261251
}
262252

263253
/// <summary>

0 commit comments

Comments
 (0)