Skip to content

Commit b30f6e2

Browse files
committed
Remove workaround
dotnet/runtime#79501 is landed, so workaround is not needed
1 parent b60558f commit b30f6e2

File tree

3 files changed

+2
-192
lines changed

3 files changed

+2
-192
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ COPY nuget.config .
55
COPY HelloWorldStatic.csproj .
66
RUN dotnet restore --runtime linux-musl-x64 HelloWorldStatic.csproj
77

8-
# Remove once https://github.com/dotnet/runtime/pull/79501 lands and propagates.
9-
COPY Microsoft.NETCore.Native.Unix.targets /root/.nuget/packages/microsoft.dotnet.ilcompiler/8.0.0-alpha.1.22609.9/build/Microsoft.NETCore.Native.Unix.targets
108
COPY . .
119
RUN dotnet publish -c Release -r linux-musl-x64 -o out HelloWorldStatic.csproj /p:InvariantGlobalization=false /bl
1210

HelloWorldStatic.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,15 @@
1111
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
1212
<StaticICULinking Condition="'$(InvariantGlobalization)' != 'true'">true</StaticICULinking>
1313
<DefineConstants Condition="'$(InvariantGlobalization)' == 'true'">$(DefineConstants);NO_GLOBALIZATION</DefineConstants>
14+
<StaticExecutable>true</StaticExecutable>
1415
</PropertyGroup>
1516

16-
<ItemGroup>
17-
<LinkerArg Include="-static" />
18-
</ItemGroup>
19-
2017
<ItemGroup>
2118
<RuntimeHostConfigurationOption Include="Switch.System.Reflection.Disabled.DoNotThrowForAssembly" Value="true" />
2219
</ItemGroup>
2320

2421
<ItemGroup>
25-
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22609.9" />
22+
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22625.2" />
2623
</ItemGroup>
2724

2825
</Project>

Microsoft.NETCore.Native.Unix.targets

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)