Skip to content

Commit 0ffb87e

Browse files
gitfoolgitfool
committed
Retarget dotnet 7.0
1 parent 844eff2 commit 0ffb87e

12 files changed

+43
-172
lines changed

‎Aws/Aws.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<RootNamespace>$(RootNamespace).Aws</RootNamespace>
55
</PropertyGroup>
66

‎Aws/packages.lock.json

+7-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
".NETCoreApp,Version=v5.0": {
4+
"net7.0": {
55
"IPNetwork2": {
66
"type": "Direct",
77
"requested": "[2.6.508, )",
@@ -143,20 +143,12 @@
143143
"Microsoft.Extensions.Logging.Abstractions": {
144144
"type": "Transitive",
145145
"resolved": "7.0.0",
146-
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==",
147-
"dependencies": {
148-
"System.Buffers": "4.5.1",
149-
"System.Memory": "4.5.5"
150-
}
146+
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
151147
},
152148
"Microsoft.Extensions.Primitives": {
153149
"type": "Transitive",
154150
"resolved": "7.0.0",
155-
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==",
156-
"dependencies": {
157-
"System.Memory": "4.5.5",
158-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
159-
}
151+
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
160152
},
161153
"Microsoft.NETCore.Platforms": {
162154
"type": "Transitive",
@@ -237,15 +229,10 @@
237229
"Serilog": "2.10.0"
238230
}
239231
},
240-
"System.Buffers": {
241-
"type": "Transitive",
242-
"resolved": "4.5.1",
243-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
244-
},
245232
"System.Memory": {
246233
"type": "Transitive",
247-
"resolved": "4.5.5",
248-
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
234+
"resolved": "4.5.3",
235+
"contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
249236
},
250237
"System.Reflection.Metadata": {
251238
"type": "Transitive",
@@ -254,8 +241,8 @@
254241
},
255242
"System.Runtime.CompilerServices.Unsafe": {
256243
"type": "Transitive",
257-
"resolved": "6.0.0",
258-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
244+
"resolved": "4.5.2",
245+
"contentHash": "wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ=="
259246
},
260247
"System.Text.Encoding.CodePages": {
261248
"type": "Transitive",

‎Cli/.dockerignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*
2-
!bin/Release/linux-x64/publish/
3-
**/config/_development.yaml
2+
!bin/Release/publish/
3+
**/_development.yaml
4+
**/*.exe

‎Cli/Cli.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<AssemblyName>pulumi-dungeon</AssemblyName>
88
<PublishOnBuild>true</PublishOnBuild>
99
</PropertyGroup>
1010

11-
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
11+
<!-- <PropertyGroup Condition="'$(Configuration)' == 'Release'">
1212
<DebuggerSupport>false</DebuggerSupport>
1313
<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
1414
<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
@@ -20,7 +20,7 @@
2020
<PublishTrimmed>true</PublishTrimmed>
2121
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
2222
<TrimMode>copyused</TrimMode>
23-
</PropertyGroup>
23+
</PropertyGroup> -->
2424

2525
<ItemGroup>
2626
<ProjectReference Include="..\Aws\Aws.csproj" />

‎Cli/Dockerfile

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM mcr.microsoft.com/dotnet/runtime-deps:7.0.0-jammy
2+
FROM mcr.microsoft.com/dotnet/aspnet:7.0.10-jammy
33

44
LABEL org.opencontainers.image.source=https://github.com/gitfool/Pulumi.Dungeon
55

@@ -12,16 +12,6 @@ RUN <<EOF
1212
mkdir -p /etc/bash_completion.d
1313
EOF
1414

15-
# Install libssl 1.1; workaround dotnet 5.0 runtime dependency removed from ubuntu jammy
16-
# renovate: datasource=repology depName=libssl1.1 packageName=ubuntu_20_04/openssl versioning=loose
17-
RUN <<EOF
18-
set -ex
19-
version=1.1.1f-1ubuntu2.16
20-
curl -fsSL https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.1_${version}_amd64.deb -o libssl1.1.deb
21-
DEBIAN_FRONTEND=noninteractive dpkg -i libssl1.1.deb
22-
rm -f libssl1.1.deb
23-
EOF
24-
2515
# Install kubectl; https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl-binary-via-curl
2616
# renovate: datasource=github-tags depName=kubectl packageName=kubernetes/kubectl extractVersion=^kubernetes-(?<version>.+)$
2717
RUN <<EOF
@@ -98,12 +88,12 @@ ENV DOTNET_HostBuilder__ReloadConfigOnChange=false
9888

9989
WORKDIR /home/user/dungeon
10090

101-
COPY --link --chown=1000:1000 bin/Release/linux-x64/publish .
91+
COPY --link --chown=1000:1000 bin/Release/publish .
10292

10393
RUN <<EOF
10494
set -ex
105-
echo "alias d='cd ~/dungeon && ./pulumi-dungeon'" >> ~/.bash_aliases
106-
chmod -x config/*.yaml
95+
echo "alias d='cd ~/dungeon && dotnet pulumi-dungeon.dll'" >> ~/.bash_aliases
96+
find . -type f -regextype posix-egrep -iregex '.*\.(dll|json|yaml)$' -exec chmod -x {} \;
10797
EOF
10898

109-
ENTRYPOINT [ "./pulumi-dungeon" ]
99+
ENTRYPOINT [ "dotnet", "pulumi-dungeon.dll" ]

‎Cli/packages.lock.json

+9-73
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
".NETCoreApp,Version=v5.0": {
4+
"net7.0": {
55
"Json.More.Net": {
66
"type": "Direct",
77
"requested": "[1.7.0, )",
@@ -236,11 +236,6 @@
236236
"Json.More.Net": "1.5.0"
237237
}
238238
},
239-
"Microsoft.Bcl.AsyncInterfaces": {
240-
"type": "Transitive",
241-
"resolved": "7.0.0",
242-
"contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg=="
243-
},
244239
"Microsoft.Build.Tasks.Git": {
245240
"type": "Transitive",
246241
"resolved": "1.1.1",
@@ -342,8 +337,6 @@
342337
"resolved": "7.0.0",
343338
"contentHash": "oONNYd71J3LzkWc4fUHl3SvMfiQMYUCo/mDHDEu76hYYxdhdrPYv6fvGv9nnKVyhE9P0h20AU8RZB5OOWQcAXg==",
344339
"dependencies": {
345-
"System.Buffers": "4.5.1",
346-
"System.Memory": "4.5.5",
347340
"System.Text.Encodings.Web": "7.0.0",
348341
"System.Text.Json": "7.0.0"
349342
}
@@ -389,18 +382,13 @@
389382
"Microsoft.Extensions.DependencyInjection": "7.0.0",
390383
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
391384
"Microsoft.Extensions.Logging.Abstractions": "7.0.0",
392-
"Microsoft.Extensions.Options": "7.0.0",
393-
"System.Diagnostics.DiagnosticSource": "7.0.0"
385+
"Microsoft.Extensions.Options": "7.0.0"
394386
}
395387
},
396388
"Microsoft.Extensions.Logging.Abstractions": {
397389
"type": "Transitive",
398390
"resolved": "7.0.0",
399-
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==",
400-
"dependencies": {
401-
"System.Buffers": "4.5.1",
402-
"System.Memory": "4.5.5"
403-
}
391+
"contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw=="
404392
},
405393
"Microsoft.Extensions.Logging.Configuration": {
406394
"type": "Transitive",
@@ -422,13 +410,11 @@
422410
"resolved": "7.0.0",
423411
"contentHash": "qt5n8bHLZPUfuRnFxJKW5q9ZwOTncdh96rtWzWpX3Y/064MlxzCSw2ELF5Jlwdo+Y4wK3I47NmUTFsV7Sg8rqg==",
424412
"dependencies": {
425-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
426413
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
427414
"Microsoft.Extensions.Logging": "7.0.0",
428415
"Microsoft.Extensions.Logging.Abstractions": "7.0.0",
429416
"Microsoft.Extensions.Logging.Configuration": "7.0.0",
430417
"Microsoft.Extensions.Options": "7.0.0",
431-
"System.Buffers": "4.5.1",
432418
"System.Text.Json": "7.0.0"
433419
}
434420
},
@@ -459,14 +445,11 @@
459445
"resolved": "7.0.0",
460446
"contentHash": "MxQXndQFviIyOPqyMeLNshXnmqcfzEHE2wWcr7BF1unSisJgouZ3tItnq+aJLGPojrW8OZSC/ZdRoR6wAq+c7w==",
461447
"dependencies": {
462-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
463448
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0",
464449
"Microsoft.Extensions.Logging": "7.0.0",
465450
"Microsoft.Extensions.Logging.Abstractions": "7.0.0",
466451
"Microsoft.Extensions.Options": "7.0.0",
467452
"Microsoft.Extensions.Primitives": "7.0.0",
468-
"System.Memory": "4.5.5",
469-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
470453
"System.Text.Json": "7.0.0"
471454
}
472455
},
@@ -485,11 +468,7 @@
485468
"Microsoft.Extensions.Primitives": {
486469
"type": "Transitive",
487470
"resolved": "7.0.0",
488-
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==",
489-
"dependencies": {
490-
"System.Memory": "4.5.5",
491-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
492-
}
471+
"contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
493472
},
494473
"Microsoft.NETCore.Platforms": {
495474
"type": "Transitive",
@@ -628,52 +607,25 @@
628607
"System.Memory": "4.5.5"
629608
}
630609
},
631-
"System.Buffers": {
632-
"type": "Transitive",
633-
"resolved": "4.5.1",
634-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
635-
},
636-
"System.Diagnostics.DiagnosticSource": {
637-
"type": "Transitive",
638-
"resolved": "7.0.0",
639-
"contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==",
640-
"dependencies": {
641-
"System.Memory": "4.5.5",
642-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
643-
}
644-
},
645610
"System.Diagnostics.EventLog": {
646611
"type": "Transitive",
647612
"resolved": "7.0.0",
648-
"contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw==",
649-
"dependencies": {
650-
"System.Security.Principal.Windows": "5.0.0"
651-
}
613+
"contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw=="
652614
},
653615
"System.Memory": {
654616
"type": "Transitive",
655617
"resolved": "4.5.5",
656618
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
657619
},
658-
"System.Numerics.Vectors": {
659-
"type": "Transitive",
660-
"resolved": "4.5.0",
661-
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
662-
},
663620
"System.Reflection.Metadata": {
664621
"type": "Transitive",
665622
"resolved": "5.0.0",
666623
"contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
667624
},
668625
"System.Runtime.CompilerServices.Unsafe": {
669626
"type": "Transitive",
670-
"resolved": "6.0.0",
671-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
672-
},
673-
"System.Security.Principal.Windows": {
674-
"type": "Transitive",
675-
"resolved": "5.0.0",
676-
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
627+
"resolved": "4.5.2",
628+
"contentHash": "wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ=="
677629
},
678630
"System.Text.Encoding.CodePages": {
679631
"type": "Transitive",
@@ -687,32 +639,16 @@
687639
"System.Text.Encodings.Web": {
688640
"type": "Transitive",
689641
"resolved": "7.0.0",
690-
"contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==",
691-
"dependencies": {
692-
"System.Buffers": "4.5.1",
693-
"System.Memory": "4.5.5",
694-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
695-
}
642+
"contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg=="
696643
},
697644
"System.Text.Json": {
698645
"type": "Transitive",
699646
"resolved": "7.0.0",
700647
"contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
701648
"dependencies": {
702-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
703-
"System.Buffers": "4.5.1",
704-
"System.Memory": "4.5.5",
705-
"System.Numerics.Vectors": "4.5.0",
706-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
707-
"System.Text.Encodings.Web": "7.0.0",
708-
"System.Threading.Tasks.Extensions": "4.5.4"
649+
"System.Text.Encodings.Web": "7.0.0"
709650
}
710651
},
711-
"System.Threading.Tasks.Extensions": {
712-
"type": "Transitive",
713-
"resolved": "4.5.4",
714-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
715-
},
716652
"YamlDotNet": {
717653
"type": "Transitive",
718654
"resolved": "13.1.1",

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<PackageTags>Pulumi;DevOps;Tools</PackageTags>
99

1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<!-- <CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages> -->
1112
<DebugType>embedded</DebugType>
1213
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
1314
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1415
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1516
<LangVersion>preview</LangVersion>
16-
<NoWarn>NU5105</NoWarn>
1717
<Nullable>enable</Nullable>
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1919
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>

‎Directory.Build.targets

-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<Project>
2-
<!-- https://github.com/dotnet/sdk/issues/1458#issuecomment-420456386 -->
3-
<Target Name="_ResolveCopyLocalNuGetPackagePdbsAndXml" Condition="$(CopyLocalLockFileAssemblies) == true" AfterTargets="ResolveReferences">
4-
<ItemGroup>
5-
<ReferenceCopyLocalPaths
6-
Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdb')"
7-
Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')" />
8-
<!-- <ReferenceCopyLocalPaths
9-
Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')"
10-
Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')" /> -->
11-
</ItemGroup>
12-
</Target>
13-
142
<Target Name="PublishOnBuild" Condition="'$(PublishOnBuild)' == 'true'" AfterTargets="Build" DependsOnTargets="Publish" />
153
</Project>

‎K8s/K8s.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<RootNamespace>$(RootNamespace).K8s</RootNamespace>
55
</PropertyGroup>
66

0 commit comments

Comments
 (0)