Skip to content

Commit dc8bfd6

Browse files
CorruptComputerCorruptComputer
committed
Remove unsupported versions of .NET
1 parent dfc9dde commit dc8bfd6

File tree

10 files changed

+29
-232
lines changed

10 files changed

+29
-232
lines changed

‎.azure-pipelines.yml‎

Lines changed: 6 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,6 @@ trigger:
33

44
resources:
55
containers:
6-
- container: 2.2-bionic
7-
image: mcr.microsoft.com/dotnet/core/sdk:2.2-bionic
8-
- container: 3.0-disco
9-
image: mcr.microsoft.com/dotnet/core/sdk:3.0-disco
10-
- container: 3.0-buster
11-
image: mcr.microsoft.com/dotnet/core/sdk:3.0-buster
12-
- container: 3.1-focal
13-
image: mcr.microsoft.com/dotnet/core/sdk:3.1-focal
14-
- container: 5.0-focal
15-
image: mcr.microsoft.com/dotnet/sdk:5.0-focal
16-
- container: 5.0-buster
17-
image: mcr.microsoft.com/dotnet/sdk:5.0-buster-slim
18-
- container: 5.0-bullseye
19-
image: mcr.microsoft.com/dotnet/sdk:5.0-bullseye-slim
20-
- container: 5.0-nanoserver
21-
image: mcr.microsoft.com/dotnet/sdk:5.0-nanoserver-1809
22-
- container: 6.0-focal
23-
image: mcr.microsoft.com/dotnet/sdk:6.0-focal
24-
- container: 6.0-bullseye
25-
image: mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim
26-
- container: 6.0-nanoserver
27-
image: mcr.microsoft.com/dotnet/sdk:6.0-nanoserver-1809
28-
- container: 7.0-bullseye
29-
image: mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim
30-
- container: 7.0-nanoserver
31-
image: mcr.microsoft.com/dotnet/sdk:7.0-nanoserver-1809
326
- container: 8.0-jammy
337
image: mcr.microsoft.com/dotnet/sdk:8.0-jammy
348
- container: 8.0-nanoserver
@@ -37,7 +11,7 @@ resources:
3711
image: mcr.microsoft.com/dotnet/sdk:9.0-noble
3812
- container: 9.0-nanoserver
3913
image: mcr.microsoft.com/dotnet/sdk:9.0-nanoserver-1809
40-
14+
4115
stages:
4216
- stage: Build
4317
jobs:
@@ -89,110 +63,19 @@ stages:
8963
strategy:
9064
maxParallel: 8
9165
matrix:
92-
3.1-focal-deb:
93-
container: 3.1-focal
94-
command: deb
95-
3.1-disco-rpm:
96-
container: 3.1-focal
97-
command: rpm
98-
3.1-focal-zip:
99-
container: 3.1-focal
100-
command: zip
101-
3.1-focal-tarball:
102-
container: 3.1-focal
103-
command: tarball
104-
105-
5.0-focal-deb:
106-
container: 5.0-focal
107-
command: deb
108-
5.0-focal-rpm:
109-
container: 5.0-focal
110-
command: rpm
111-
5.0-focal-zip:
112-
container: 5.0-focal
113-
command: zip
114-
5.0-focal-tarball:
115-
container: 5.0-focal
116-
command: tarball
117-
118-
5.0-buster-deb:
119-
container: 5.0-buster
120-
command: deb
121-
5.0-buster-rpm:
122-
container: 5.0-buster
123-
command: rpm
124-
5.0-buster-zip:
125-
container: 5.0-buster
126-
command: zip
127-
5.0-buster-tarball:
128-
container: 5.0-buster
129-
command: tarball
130-
131-
5.0-bullseye-deb:
132-
container: 5.0-bullseye
133-
command: deb
134-
5.0-bullseye-rpm:
135-
container: 5.0-bullseye
136-
command: rpm
137-
5.0-bullseye-zip:
138-
container: 5.0-bullseye
139-
command: zip
140-
5.0-bullseye-tarball:
141-
container: 5.0-bullseye
142-
command: tarball
143-
144-
6.0-focal-deb:
145-
container: 6.0-focal
146-
command: deb
147-
6.0-focal-rpm:
148-
container: 6.0-focal
149-
command: rpm
150-
6.0-focal-zip:
151-
container: 6.0-focal
152-
command: zip
153-
6.0-focal-tarball:
154-
container: 6.0-focal
155-
command: tarball
156-
157-
6.0-bullseye-deb:
158-
container: 6.0-bullseye
159-
command: deb
160-
6.0-bullseye-rpm:
161-
container: 6.0-bullseye
162-
command: rpm
163-
6.0-bullseye-zip:
164-
container: 6.0-bullseye
165-
command: zip
166-
6.0-bullseye-tarball:
167-
container: 6.0-bullseye
168-
command: tarball
169-
170-
7.0-bullseye-deb:
171-
container: 7.0-bullseye
172-
command: deb
173-
7.0-bullseye-rpm:
174-
container: 7.0-bullseye
175-
command: rpm
176-
7.0-bullseye-zip:
177-
container: 7.0-bullseye
178-
command: zip
179-
7.0-bullseye-tarball:
180-
container: 7.0-bullseye
181-
command: tarball
182-
18366
8.0-jammy-deb:
184-
container: 8.0-jammy
67+
container: 8.0-jammy
18568
command: deb
18669
8.0-jammy-rpm:
187-
container: 8.0-jammy
70+
container: 8.0-jammy
18871
command: rpm
18972
8.0-jammy-zip:
19073
container: 8.0-jammy
19174
command: zip
19275
8.0-jammy-tarball:
19376
container: 8.0-jammy
19477
command: tarball
195-
78+
19679
9.0-noble-deb:
19780
container: 9.0-noble
19881
command: deb
@@ -218,41 +101,13 @@ stages:
218101
strategy:
219102
maxParallel: 8
220103
matrix:
221-
self-contained-3_1:
222-
suite: self-contained
223-
framework: netcoreapp3.1
224-
framework-dependent-app-3_1:
225-
suite: framework-dependent
226-
framework: netcoreapp3.1
227-
228-
self-contained-5_0:
229-
suite: self-contained
230-
framework: net5.0
231-
framework-dependent-app-5_0:
232-
suite: framework-dependent
233-
framework: net5.0
234-
235-
self-contained-6_0:
236-
suite: self-contained
237-
framework: net6.0
238-
framework-dependent-app-6_0:
239-
suite: framework-dependent
240-
framework: net6.0
241-
242-
self-contained-7_0:
243-
suite: self-contained
244-
framework: net7.0
245-
framework-dependent-app-7_0:
246-
suite: framework-dependent
247-
framework: net7.0
248-
249104
self-contained-8_0:
250105
suite: self-contained
251106
framework: net8.0
252107
framework-dependent-app-8_0:
253108
suite: framework-dependent
254109
framework: net8.0
255-
110+
256111
self-contained-9_0:
257112
suite: self-contained
258113
framework: net9.0
@@ -377,7 +232,7 @@ stages:
377232
inputs:
378233
artifactName: 'nuget'
379234
displayName: 'Download NuGet artifacts'
380-
235+
381236
- task: NuGetToolInstaller@0
382237
displayName: Install NuGet
383238

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
uses: actions/setup-dotnet@v4
1616
with:
1717
dotnet-version: |
18-
6.0.x
19-
7.0.x
2018
8.0.x
2119
9.0.x
2220

‎Packaging.Targets.Tests/Packaging.Targets.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Packaging.Targets/build/Packaging.Targets.targets‎

Lines changed: 11 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
and allow the user to override this. -->
1111
<PackageVersion Condition="'$(PackageVersion)' == '' AND '$(Version)' != ''">$(Version)</PackageVersion>
1212
<PackageVersion Condition="'$(PackageVersion)' == '' AND '$(Version)' == ''">1.0.0</PackageVersion>
13-
13+
1414
<PackagePrefix Condition="'$(PackagePrefix)' == ''">$(TargetName)</PackagePrefix>
1515
<PackageName Condition="'$(PackageName)' == '' AND '$(RuntimeIdentifier)' != ''">$(PackagePrefix).$(PackageVersion).$(RuntimeIdentifier)</PackageName>
1616
<PackageName Condition="'$(PackageName)' == ''">$(PackagePrefix).$(PackageVersion)</PackageName>
@@ -51,7 +51,7 @@
5151
https://github.com/dotnet/core-setup/blob/release/2.2/src/pkg/packaging/rpm/
5252
https://github.com/dotnet/core-setup/blob/master/src/pkg/packaging/rpm/
5353
https://github.com/dotnet/runtime/tree/v6.0.0/src/installer/pkg/sfx/installers/dotnet-runtime-deps
54-
54+
5555
The syntax for "boolean dependencies" is described here (available starting
5656
with rpm 3.14):
5757
https://rpm.org/user_doc/boolean_dependencies.html
@@ -64,34 +64,6 @@
6464
- Upstream lists compat libraries for OpenSSL 1.0 instead of OpenSSL 1.1, that
6565
seems like an oversight.
6666
-->
67-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp2.1'">
68-
<RpmDotNetDependency Include="dotnet-runtime-2.1" Version="" />
69-
</ItemGroup>
70-
71-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp2.2'">
72-
<RpmDotNetDependency Include="dotnet-runtime-2.2" Version="" />
73-
</ItemGroup>
74-
75-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp3.0'">
76-
<RpmDotNetDependency Include="dotnet-runtime-3.0" Version="" />
77-
</ItemGroup>
78-
79-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp3.1'">
80-
<RpmDotNetDependency Include="dotnet-runtime-3.1" Version="" />
81-
</ItemGroup>
82-
83-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net5.0'">
84-
<RpmDotNetDependency Include="dotnet-runtime-5.0" Version="" />
85-
</ItemGroup>
86-
87-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net6.0'">
88-
<RpmDotNetDependency Include="dotnet-runtime-6.0" Version="" />
89-
</ItemGroup>
90-
91-
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net7.0'">
92-
<RpmDotNetDependency Include="dotnet-runtime-7.0" Version="" />
93-
</ItemGroup>
94-
9567
<ItemGroup Condition="'@(RpmDotNetDependency)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net8.0'">
9668
<RpmDotNetDependency Include="dotnet-runtime-8.0" Version="" />
9769
</ItemGroup>
@@ -108,12 +80,12 @@
10880

10981
<ItemGroup Condition="'$(SkipRpmDependencies)' == 'true'">
11082
<RpmDotNetDependency Remove="@(RpmDotNetDependency)"/>
111-
</ItemGroup>
83+
</ItemGroup>
11284

11385
<Message Text="Creating RPM package $(RpmPath)" Importance="high"/>
11486

11587
<MakeDir Directories="$(PackageDir)"/>
116-
88+
11789
<RpmTask PublishDir="$(PublishDir)"
11890
RpmPath="$(RpmPath)"
11991
CpioPath="$(CpioPath)"
@@ -157,34 +129,6 @@
157129
<!-- DebPackageArchitecture is the architecture used for the deb package. Values like any, i386, amd64, arm and arm64 are supported -->
158130
<DebPackageArchitecture Condition="'$(DebPackageArchitecture)' == ''"></DebPackageArchitecture>
159131
</PropertyGroup>
160-
161-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp2.1'">
162-
<DebDotNetDependencies Include="dotnet-runtime-2.1"/>
163-
</ItemGroup>
164-
165-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp2.2'">
166-
<DebDotNetDependencies Include="dotnet-runtime-2.2"/>
167-
</ItemGroup>
168-
169-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp3.0'">
170-
<DebDotNetDependencies Include="dotnet-runtime-3.0"/>
171-
</ItemGroup>
172-
173-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'netcoreapp3.1'">
174-
<DebDotNetDependencies Include="dotnet-runtime-3.1"/>
175-
</ItemGroup>
176-
177-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net5.0'">
178-
<DebDotNetDependencies Include="dotnet-runtime-5.0"/>
179-
</ItemGroup>
180-
181-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net6.0'">
182-
<DebDotNetDependencies Include="dotnet-runtime-6.0"/>
183-
</ItemGroup>
184-
185-
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net7.0'">
186-
<DebDotNetDependencies Include="dotnet-runtime-7.0"/>
187-
</ItemGroup>
188132

189133
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' == '' AND '$(TargetFramework)' == 'net8.0'">
190134
<DebDotNetDependencies Include="dotnet-runtime-8.0"/>
@@ -196,7 +140,7 @@
196140

197141
<!-- Dependency list for netcore3.1, updated to support Ubuntu 20.10/21.04 -->
198142
<ItemGroup Condition="'@(DebDotNetDependencies)' == '' AND '$(RuntimeIdentifier)' != ''">
199-
<DebDependencies Include="libc6"/>
143+
<DebDependencies Include="libc6"/>
200144
<DebDependencies Include="libgcc1"/>
201145
<DebDependencies Include="libgssapi-krb5-2"/>
202146
<DebDependencies Include="libstdc++6"/>
@@ -207,11 +151,11 @@
207151

208152
<ItemGroup Condition="'$(SkipDebDependencies)' == 'true'">
209153
<DebDotNetDependencies Remove="@(DebDotNetDependencies)"/>
210-
</ItemGroup>
211-
154+
</ItemGroup>
155+
212156
<MakeDir Directories="$(PackageDir)"/>
213-
214-
<DebTask PublishDir="$(PublishDir)"
157+
158+
<DebTask PublishDir="$(PublishDir)"
215159
DebPath="$(DebPath)"
216160
DebTarPath="$(DebTarPath)"
217161
DebTarXzPath="$(DebTarXzPath)"
@@ -250,7 +194,7 @@
250194
<Message Text="Creating tarball $(TarballPath)" Importance="high"/>
251195

252196
<MakeDir Directories="$(PackageDir)"/>
253-
197+
254198
<TarballTask PublishDir="$(PublishDir)"
255199
TarballPath="$(TarballPath)"
256200
Prefix="$(TarballPrefix)"
@@ -265,7 +209,7 @@
265209
<Message Text="Creating zip package $(ZipPath)" Importance="high"/>
266210

267211
<MakeDir Directories="$(PackageDir)"/>
268-
212+
269213
<ZipTask PublishDir="$(PublishDir)"
270214
ZipPath="$(ZipPath)"/>
271215
</Target>

‎dotnet-deb/dotnet-deb.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging deb debian ubuntu mint installer</PackageTags>
66
<Description>Create Debian and Ubuntu installers (.deb files ) of your .NET Core projects straight from the command line.
77

@@ -17,7 +17,7 @@ See https://github.com/qmfrederik/dotnet-packaging/ for more information on how
1717
<PackageReference Include="Microsoft.Build" Version="16.6.0" ExcludeAssets="runtime" />
1818
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
1919
</ItemGroup>
20-
20+
2121
<ItemGroup>
2222
<Compile Include="..\dotnet-rpm\PackagingRunner.cs" Link="PackagingRunner.cs" />
2323
</ItemGroup>

‎dotnet-rpm/dotnet-rpm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<PackageTags>dotnet cli packaging rpm package installer</PackageTags>
66
<Description>Create RPM packages (.rpm files) of your .NET Core projects straight from the command line.
77

0 commit comments

Comments
 (0)