Skip to content

Commit aba2197

Browse files
detangle build version numbers
1 parent 5eac1ee commit aba2197

File tree

10 files changed

+191
-80
lines changed

10 files changed

+191
-80
lines changed

ImageSharp.Drawing.CI.slnf

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

ImageSharp.Drawing.Samples.sln

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{69CD3146-97C1-401E-BDDB-1FFBA63B8810}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing", "src\ImageSharp.Drawing\ImageSharp.Drawing.csproj", "{042B144E-5444-4B88-B4F2-038E54FC25D0}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{380AB484-A32A-416A-81E7-E48A134913E8}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DrawingBackendBenchmark", "samples\DrawingBackendBenchmark\DrawingBackendBenchmark.csproj", "{0AF23A97-CD73-409A-AA29-D214AA400AB0}"
21+
EndProject
22+
Global
23+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
24+
Debug|Any CPU = Debug|Any CPU
25+
Debug|x64 = Debug|x64
26+
Debug|x86 = Debug|x86
27+
Release|Any CPU = Release|Any CPU
28+
Release|x64 = Release|x64
29+
Release|x86 = Release|x86
30+
EndGlobalSection
31+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x64.ActiveCfg = Debug|Any CPU
35+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x64.Build.0 = Debug|Any CPU
36+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x86.ActiveCfg = Debug|Any CPU
37+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Debug|x86.Build.0 = Debug|Any CPU
38+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x64.ActiveCfg = Release|Any CPU
41+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x64.Build.0 = Release|Any CPU
42+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x86.ActiveCfg = Release|Any CPU
43+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810}.Release|x86.Build.0 = Release|Any CPU
44+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x64.ActiveCfg = Debug|Any CPU
47+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x64.Build.0 = Debug|Any CPU
48+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x86.ActiveCfg = Debug|Any CPU
49+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Debug|x86.Build.0 = Debug|Any CPU
50+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x64.ActiveCfg = Release|Any CPU
53+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x64.Build.0 = Release|Any CPU
54+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.ActiveCfg = Release|Any CPU
55+
{042B144E-5444-4B88-B4F2-038E54FC25D0}.Release|x86.Build.0 = Release|Any CPU
56+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x64.ActiveCfg = Debug|Any CPU
59+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x64.Build.0 = Debug|Any CPU
60+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x86.ActiveCfg = Debug|Any CPU
61+
{380AB484-A32A-416A-81E7-E48A134913E8}.Debug|x86.Build.0 = Debug|Any CPU
62+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|Any CPU.Build.0 = Release|Any CPU
64+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x64.ActiveCfg = Release|Any CPU
65+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x64.Build.0 = Release|Any CPU
66+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x86.ActiveCfg = Release|Any CPU
67+
{380AB484-A32A-416A-81E7-E48A134913E8}.Release|x86.Build.0 = Release|Any CPU
68+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
70+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
71+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x64.Build.0 = Debug|Any CPU
72+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x86.ActiveCfg = Debug|Any CPU
73+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Debug|x86.Build.0 = Debug|Any CPU
74+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
75+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|Any CPU.Build.0 = Release|Any CPU
76+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x64.ActiveCfg = Release|Any CPU
77+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x64.Build.0 = Release|Any CPU
78+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x86.ActiveCfg = Release|Any CPU
79+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF}.Release|x86.Build.0 = Release|Any CPU
80+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
82+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x64.ActiveCfg = Debug|Any CPU
83+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x64.Build.0 = Debug|Any CPU
84+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x86.ActiveCfg = Debug|Any CPU
85+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Debug|x86.Build.0 = Debug|Any CPU
86+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
87+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|Any CPU.Build.0 = Release|Any CPU
88+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x64.ActiveCfg = Release|Any CPU
89+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x64.Build.0 = Release|Any CPU
90+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x86.ActiveCfg = Release|Any CPU
91+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3}.Release|x86.Build.0 = Release|Any CPU
92+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x64.ActiveCfg = Debug|Any CPU
95+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x64.Build.0 = Debug|Any CPU
96+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x86.ActiveCfg = Debug|Any CPU
97+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Debug|x86.Build.0 = Debug|Any CPU
98+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
99+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|Any CPU.Build.0 = Release|Any CPU
100+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x64.ActiveCfg = Release|Any CPU
101+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x64.Build.0 = Release|Any CPU
102+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x86.ActiveCfg = Release|Any CPU
103+
{0AF23A97-CD73-409A-AA29-D214AA400AB0}.Release|x86.Build.0 = Release|Any CPU
104+
EndGlobalSection
105+
GlobalSection(SolutionProperties) = preSolution
106+
HideSolutionNode = FALSE
107+
EndGlobalSection
108+
GlobalSection(NestedProjects) = preSolution
109+
{69CD3146-97C1-401E-BDDB-1FFBA63B8810} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
110+
{042B144E-5444-4B88-B4F2-038E54FC25D0} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
111+
{380AB484-A32A-416A-81E7-E48A134913E8} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
112+
{439C7CCB-78F0-4F24-9D7F-6D6659495DEF} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
113+
{AEFE7C59-5D1C-4F14-A83F-0FD665130FA3} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
114+
{0AF23A97-CD73-409A-AA29-D214AA400AB0} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
115+
EndGlobalSection
116+
EndGlobal

ImageSharp.Drawing.sln

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -324,26 +324,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Drawing.Benchmar
324324
EndProject
325325
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
326326
EndProject
327-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{528610AC-7C0C-46E8-9A2D-D46FD92FEE29}"
328-
ProjectSection(SolutionItems) = preProject
329-
samples\Directory.Build.props = samples\Directory.Build.props
330-
samples\Directory.Build.targets = samples\Directory.Build.targets
331-
samples\Drawing.Samples.ruleset = samples\Drawing.Samples.ruleset
332-
EndProjectSection
333-
EndProject
334-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{5493F024-0A3F-420C-AC2D-05B77A36025B}"
335-
EndProject
336-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawingBackendBenchmark", "samples\DrawingBackendBenchmark\DrawingBackendBenchmark.csproj", "{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}"
337-
EndProject
338327
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{23859314-5693-4E6C-BE5C-80A433439D2A}"
339328
ProjectSection(SolutionItems) = preProject
340329
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
341330
EndProjectSection
342331
EndProject
343332
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU", "src\ImageSharp.Drawing.WebGPU\ImageSharp.Drawing.WebGPU.csproj", "{061582C2-658F-40AE-A978-7D74A4EB2C0A}"
344333
EndProject
345-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebGPUWindowDemo", "samples\WebGPUWindowDemo\WebGPUWindowDemo.csproj", "{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}"
346-
EndProject
347334
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageSharp.Drawing.WebGPU.ShaderGen", "src\ImageSharp.Drawing.WebGPU.ShaderGen\ImageSharp.Drawing.WebGPU.ShaderGen.csproj", "{C7606104-5D58-4670-912C-3F336606B02D}"
348335
EndProject
349336
Global
@@ -392,30 +379,6 @@ Global
392379
{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x64.Build.0 = Release|Any CPU
393380
{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.ActiveCfg = Release|Any CPU
394381
{59804113-1DD4-4F80-8D06-35FF71652508}.Release|x86.Build.0 = Release|Any CPU
395-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
396-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|Any CPU.Build.0 = Debug|Any CPU
397-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|x64.ActiveCfg = Debug|Any CPU
398-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|x64.Build.0 = Debug|Any CPU
399-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|x86.ActiveCfg = Debug|Any CPU
400-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Debug|x86.Build.0 = Debug|Any CPU
401-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
402-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|Any CPU.Build.0 = Release|Any CPU
403-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|x64.ActiveCfg = Release|Any CPU
404-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|x64.Build.0 = Release|Any CPU
405-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|x86.ActiveCfg = Release|Any CPU
406-
{5493F024-0A3F-420C-AC2D-05B77A36025B}.Release|x86.Build.0 = Release|Any CPU
407-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
408-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
409-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|x64.ActiveCfg = Debug|Any CPU
410-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|x64.Build.0 = Debug|Any CPU
411-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|x86.ActiveCfg = Debug|Any CPU
412-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Debug|x86.Build.0 = Debug|Any CPU
413-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
414-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|Any CPU.Build.0 = Release|Any CPU
415-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|x64.ActiveCfg = Release|Any CPU
416-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|x64.Build.0 = Release|Any CPU
417-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|x86.ActiveCfg = Release|Any CPU
418-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4}.Release|x86.Build.0 = Release|Any CPU
419382
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
420383
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
421384
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -428,18 +391,6 @@ Global
428391
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x64.Build.0 = Release|Any CPU
429392
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.ActiveCfg = Release|Any CPU
430393
{061582C2-658F-40AE-A978-7D74A4EB2C0A}.Release|x86.Build.0 = Release|Any CPU
431-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
432-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
433-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|x64.ActiveCfg = Debug|Any CPU
434-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|x64.Build.0 = Debug|Any CPU
435-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|x86.ActiveCfg = Debug|Any CPU
436-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Debug|x86.Build.0 = Debug|Any CPU
437-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
438-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|Any CPU.Build.0 = Release|Any CPU
439-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|x64.ActiveCfg = Release|Any CPU
440-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|x64.Build.0 = Release|Any CPU
441-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|x86.ActiveCfg = Release|Any CPU
442-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA}.Release|x86.Build.0 = Release|Any CPU
443394
{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
444395
{C7606104-5D58-4670-912C-3F336606B02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
445396
{C7606104-5D58-4670-912C-3F336606B02D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -477,11 +428,8 @@ Global
477428
{EA3000E9-2A91-4EC4-8A68-E566DEBDC4F6} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
478429
{59804113-1DD4-4F80-8D06-35FF71652508} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
479430
{68A8CC40-6AED-4E96-B524-31B1158FDEEA} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
480-
{5493F024-0A3F-420C-AC2D-05B77A36025B} = {528610AC-7C0C-46E8-9A2D-D46FD92FEE29}
481-
{7A9D2E23-4EF4-4C10-A449-2E80E37F26D4} = {528610AC-7C0C-46E8-9A2D-D46FD92FEE29}
482431
{23859314-5693-4E6C-BE5C-80A433439D2A} = {1799C43E-5C54-4A8F-8D64-B1475241DB0D}
483432
{061582C2-658F-40AE-A978-7D74A4EB2C0A} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
484-
{2541FDCD-78AC-40DB-B5E3-6A715DC132BA} = {528610AC-7C0C-46E8-9A2D-D46FD92FEE29}
485433
{C7606104-5D58-4670-912C-3F336606B02D} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
486434
EndGlobalSection
487435
GlobalSection(ExtensibilityGlobals) = postSolution

ci-build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ param(
33
[string]$targetFramework
44
)
55

6-
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.CI.slnf"
6+
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
77

88
dotnet clean $solution -c Release
99

ci-pack.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.CI.slnf"
1+
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
22

33
dotnet clean $solution -c Release
44

ci-test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param(
1212
)
1313

1414
$netFxRegex = '^net\d+'
15-
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.CI.slnf"
15+
$solution = Join-Path $PSScriptRoot "ImageSharp.Drawing.sln"
1616

1717
if ($codecov -eq 'true') {
1818

src/Directory.Build.targets

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,46 @@
1616
<!-- Import the solution .targets file. -->
1717
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
1818

19+
<!--
20+
Override the WebGPU package version so it tracks the main ImageSharp.Drawing
21+
version but uses a different major number (defined by WebGpuVersionMajor).
22+
For example, if MinVer calculates 3.0.0-alpha.0.201 for the main project,
23+
the WebGPU package becomes 1.0.0-alpha.0.201.
24+
See: https://github.com/adamralph/minver#can-i-use-the-version-calculated-by-minver-for-other-purposes
25+
-->
26+
<PropertyGroup>
27+
<MinVerMinimumMajorMinor>3.0</MinVerMinimumMajorMinor>
28+
<WebGpuVersionMajor>1</WebGpuVersionMajor>
29+
</PropertyGroup>
30+
31+
<Target Name="SetWebGpuVersionNumber" AfterTargets="MinVer" Condition="'$(MSBuildProjectName)' == 'ImageSharp.Drawing.WebGPU' and '$(IsContinuousIntegration)' == 'true'">
32+
<PropertyGroup>
33+
<_WebGpuVersionPrefix>$(WebGpuVersionMajor).$(MinVerMinor).$(MinVerPatch)</_WebGpuVersionPrefix>
34+
<_WebGpuPreReleaseSuffix></_WebGpuPreReleaseSuffix>
35+
<_WebGpuPreReleaseSuffix Condition="'$(MinVerPreRelease)' != ''">-$(MinVerPreRelease)</_WebGpuPreReleaseSuffix>
36+
<_WebGpuBuildMetadataSuffix></_WebGpuBuildMetadataSuffix>
37+
<_WebGpuBuildMetadataSuffix Condition="'$(MinVerBuildMetadata)' != ''">+$(MinVerBuildMetadata)</_WebGpuBuildMetadataSuffix>
38+
39+
<AssemblyVersion>$(WebGpuVersionMajor).0.0.0</AssemblyVersion>
40+
<FileVersion>$(WebGpuVersionMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
41+
<Version>$(_WebGpuVersionPrefix)$(_WebGpuPreReleaseSuffix)</Version>
42+
<PackageVersion>$(Version)</PackageVersion>
43+
<InformationalVersion>$(Version)$(_WebGpuBuildMetadataSuffix)</InformationalVersion>
44+
</PropertyGroup>
45+
</Target>
46+
47+
<!--
48+
Workaround: _GetProjectVersion does not trigger MinVer on referenced projects
49+
during pack, resulting in the dependency version falling back to VersionPrefix.
50+
The root cause is unknown; other solutions using the same MinVer + ProjectReference
51+
pattern resolve the correct version as expected.
52+
-->
53+
<Target Name="FixProjectReferenceDependencyVersions" AfterTargets="_GetProjectReferenceVersions" BeforeTargets="GenerateNuspec" Condition="'$(MSBuildProjectName)' == 'ImageSharp.Drawing.WebGPU' and '$(IsContinuousIntegration)' == 'true'">
54+
<ItemGroup>
55+
<_ProjectReferencesWithVersions Update="@(_ProjectReferencesWithVersions)">
56+
<ProjectVersion>$(MinVerVersion)</ProjectVersion>
57+
</_ProjectReferencesWithVersions>
58+
</ItemGroup>
59+
</Target>
60+
1961
</Project>

0 commit comments

Comments
 (0)