Skip to content

Commit 78398f3

Browse files
ellahathawayellahathaway
committed
Break into two projects, a cli tool (framework) and a task (core and framework)
1 parent 96e2b6c commit 78398f3

17 files changed

+669
-573
lines changed

‎Arcade.sln

+39-25
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SwaggerGen
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI", "src\Microsoft.DotNet.GenAPI\Microsoft.DotNet.GenAPI.csproj", "{9427265E-C224-4B40-8157-F05529D084D3}"
3737
EndProject
38-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignCheck", "SignCheck", "{A704E5B2-86A4-4D4F-902D-C10EA18C12DF}"
3938
EndProject
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SignCheck", "src\SignCheck\SignCheck\Microsoft.DotNet.SignCheck.csproj", "{AF298985-511F-476A-8F62-79908BE8DF01}"
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheckLibrary", "src\SignCheck\Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj", "{2A62655C-1AE0-480E-9F1A-E21F21C1D095}"
4140
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SignCheckLibrary", "src\SignCheck\Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj", "{39B69A56-43E9-480D-9A60-8E0917795FE8}"
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheck", "src\SignCheck\SignCheck\Microsoft.DotNet.SignCheck.csproj", "{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}"
4342
EndProject
43+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheckTask", "src\SignCheck\SignCheckTask\Microsoft.DotNet.SignCheckTask.csproj", "{F6F5E649-F477-44ED-BAB2-11D4F0E87402}"
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinShimmer", "src\WinShimmer\WinShimmer.csproj", "{39C3FC42-21E8-40BF-AE3F-CB9C4CC226D7}"
4545
EndProject
4646
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Tasks.Packaging", "src\Microsoft.DotNet.Build.Tasks.Packaging\src\Microsoft.DotNet.Build.Tasks.Packaging.csproj", "{EFC8C541-1DC4-40DA-B6E5-FBF44F6DD8BC}"
@@ -327,26 +327,6 @@ Global
327327
{9427265E-C224-4B40-8157-F05529D084D3}.Release|x64.Build.0 = Release|Any CPU
328328
{9427265E-C224-4B40-8157-F05529D084D3}.Release|x86.ActiveCfg = Release|Any CPU
329329
{9427265E-C224-4B40-8157-F05529D084D3}.Release|x86.Build.0 = Release|Any CPU
330-
{AF298985-511F-476A-8F62-79908BE8DF01}.Debug|Any CPU.ActiveCfg = Debug|x86
331-
{AF298985-511F-476A-8F62-79908BE8DF01}.Debug|Any CPU.Build.0 = Debug|x86
332-
{AF298985-511F-476A-8F62-79908BE8DF01}.Debug|x64.ActiveCfg = Debug|x86
333-
{AF298985-511F-476A-8F62-79908BE8DF01}.Debug|x86.ActiveCfg = Debug|x86
334-
{AF298985-511F-476A-8F62-79908BE8DF01}.Debug|x86.Build.0 = Debug|x86
335-
{AF298985-511F-476A-8F62-79908BE8DF01}.Release|Any CPU.ActiveCfg = Release|x86
336-
{AF298985-511F-476A-8F62-79908BE8DF01}.Release|Any CPU.Build.0 = Release|x86
337-
{AF298985-511F-476A-8F62-79908BE8DF01}.Release|x64.ActiveCfg = Release|x86
338-
{AF298985-511F-476A-8F62-79908BE8DF01}.Release|x86.ActiveCfg = Release|x86
339-
{AF298985-511F-476A-8F62-79908BE8DF01}.Release|x86.Build.0 = Release|x86
340-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Debug|Any CPU.ActiveCfg = Debug|x86
341-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Debug|Any CPU.Build.0 = Debug|x86
342-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Debug|x64.ActiveCfg = Debug|x86
343-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Debug|x86.ActiveCfg = Debug|x86
344-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Debug|x86.Build.0 = Debug|x86
345-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Release|Any CPU.ActiveCfg = Release|x86
346-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Release|Any CPU.Build.0 = Release|x86
347-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Release|x64.ActiveCfg = Release|x86
348-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Release|x86.ActiveCfg = Release|x86
349-
{39B69A56-43E9-480D-9A60-8E0917795FE8}.Release|x86.Build.0 = Release|x86
350330
{39C3FC42-21E8-40BF-AE3F-CB9C4CC226D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
351331
{39C3FC42-21E8-40BF-AE3F-CB9C4CC226D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
352332
{39C3FC42-21E8-40BF-AE3F-CB9C4CC226D7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -971,6 +951,42 @@ Global
971951
{1F5118A8-A5C5-4D18-AF34-FFB60FECCD45}.Release|x64.Build.0 = Release|Any CPU
972952
{1F5118A8-A5C5-4D18-AF34-FFB60FECCD45}.Release|x86.ActiveCfg = Release|Any CPU
973953
{1F5118A8-A5C5-4D18-AF34-FFB60FECCD45}.Release|x86.Build.0 = Release|Any CPU
954+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
955+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|Any CPU.Build.0 = Debug|Any CPU
956+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|x64.ActiveCfg = Debug|Any CPU
957+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|x64.Build.0 = Debug|Any CPU
958+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|x86.ActiveCfg = Debug|Any CPU
959+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Debug|x86.Build.0 = Debug|Any CPU
960+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|Any CPU.ActiveCfg = Release|Any CPU
961+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|Any CPU.Build.0 = Release|Any CPU
962+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|x64.ActiveCfg = Release|Any CPU
963+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|x64.Build.0 = Release|Any CPU
964+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|x86.ActiveCfg = Release|Any CPU
965+
{2A62655C-1AE0-480E-9F1A-E21F21C1D095}.Release|x86.Build.0 = Release|Any CPU
966+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
967+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
968+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|x64.ActiveCfg = Debug|Any CPU
969+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|x64.Build.0 = Debug|Any CPU
970+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|x86.ActiveCfg = Debug|Any CPU
971+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Debug|x86.Build.0 = Debug|Any CPU
972+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
973+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|Any CPU.Build.0 = Release|Any CPU
974+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|x64.ActiveCfg = Release|Any CPU
975+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|x64.Build.0 = Release|Any CPU
976+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|x86.ActiveCfg = Release|Any CPU
977+
{40CB2592-3B06-4D0D-9878-7DFD5C4B3E9E}.Release|x86.Build.0 = Release|Any CPU
978+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
979+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|Any CPU.Build.0 = Debug|Any CPU
980+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|x64.ActiveCfg = Debug|Any CPU
981+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|x64.Build.0 = Debug|Any CPU
982+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|x86.ActiveCfg = Debug|Any CPU
983+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Debug|x86.Build.0 = Debug|Any CPU
984+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|Any CPU.ActiveCfg = Release|Any CPU
985+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|Any CPU.Build.0 = Release|Any CPU
986+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|x64.ActiveCfg = Release|Any CPU
987+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|x64.Build.0 = Release|Any CPU
988+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|x86.ActiveCfg = Release|Any CPU
989+
{F6F5E649-F477-44ED-BAB2-11D4F0E87402}.Release|x86.Build.0 = Release|Any CPU
974990
EndGlobalSection
975991
GlobalSection(SolutionProperties) = preSolution
976992
HideSolutionNode = FALSE
@@ -982,8 +998,6 @@ Global
982998
{FF9DA4D9-3A84-441B-8AAE-B73B6D1EE8B3} = {BB99CE55-AD68-484A-9474-B8BACED247AB}
983999
{697EB593-3277-4C43-B8F3-C578E21B051B} = {BB99CE55-AD68-484A-9474-B8BACED247AB}
9841000
{4FA6B420-53A3-4956-9C02-8649A720A9F5} = {BB99CE55-AD68-484A-9474-B8BACED247AB}
985-
{AF298985-511F-476A-8F62-79908BE8DF01} = {A704E5B2-86A4-4D4F-902D-C10EA18C12DF}
986-
{39B69A56-43E9-480D-9A60-8E0917795FE8} = {A704E5B2-86A4-4D4F-902D-C10EA18C12DF}
9871001
{F23ED302-7451-4D40-85C3-FACFCF884661} = {C53DD924-C212-49EA-9BC4-1827421361EF}
9881002
{BA4250FD-9258-4469-A16D-48A0CAF5A2F8} = {C53DD924-C212-49EA-9BC4-1827421361EF}
9891003
{DC0D0EE5-1C0C-4D3E-BA0B-D6A59717DA94} = {6BE49638-F842-4329-BE8A-30C0F30CCAA5}

‎src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/SigningValidation.proj

+4-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
<PropertyGroup>
2222
<TargetFramework>$(NetToolCurrent)</TargetFramework>
2323
<NETCORE_ENGINEERING_TELEMETRY>Build</NETCORE_ENGINEERING_TELEMETRY>
24-
<SignCheckTaskAssembly>$(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(MicrosoftDotNetSignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckTaskAssembly>
2524
</PropertyGroup>
2625

27-
<UsingTask TaskName="SignCheck.SignCheckTask" AssemblyFile="$(SignCheckTaskAssembly)" />
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.DotNet.SignCheckTask" Version="$(MicrosoftDotNetSignCheckTaskVersion)" />
28+
</ItemGroup>
2829

2930
<Target Name="Execute">
3031
<PropertyGroup>
@@ -40,7 +41,7 @@
4041
Documentation for these arguments is available here:
4142
https://github.com/dotnet/arcade/tree/master/src/SignCheck
4243
-->
43-
<SignCheckTask
44+
<Microsoft.DotNet.SignCheckTask.SignCheckTask
4445
Recursive="true"
4546
FileStatus="UnsignedFiles"
4647
InputFiles="$(InputFiles)"
@@ -60,8 +61,4 @@
6061
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
6162
</Target>
6263

63-
<ItemGroup>
64-
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(MicrosoftDotNetSignCheckVersion)" />
65-
</ItemGroup>
66-
6764
</Project>

‎src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MicrosoftDotNetMaestroTasksVersion>$(MicrosoftDotNetMaestroTasksVersion)</MicrosoftDotNetMaestroTasksVersion>
88
<MicrosoftDotNetBuildTasksVisualStudioVersion>$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksVisualStudioVersion>
99
<MicrosoftDotNetBuildTasksFeedVersion Condition="'$(MicrosoftDotNetBuildTasksFeedVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksFeedVersion>
10-
<MicrosoftDotNetSignCheckVersion Condition="'$(MicrosoftDotNetSignCheckVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignCheckVersion>
10+
<MicrosoftDotNetSignCheckTaskVersion Condition="'$(MicrosoftDotNetSignCheckTaskVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignCheckTaskVersion>
1111
<MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
1212
</PropertyGroup>
1313

‎src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<PropertyGroup>
66
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
7-
<Platforms>x86</Platforms>
87
<SignAssembly>false</SignAssembly>
98
<RootNamespace>Microsoft.SignCheck</RootNamespace>
109
<!-- This assembly is bundled in the Microsoft.DotNet.SignCheck package and is not mean to be used as a class library package. -->
1110
<IsPackable>false</IsPackable>
1211
<IsTool>true</IsTool>
12+
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

‎src/SignCheck/SignCheck.sln

+56-14
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,73 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.0
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignCheck", "SignCheck\Microsoft.DotNet.SignCheck.csproj", "{FA490389-CA35-41B4-8EEA-15DB39093716}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.SignCheck", "Microsoft.SignCheck", "{CD7E959D-5591-47DF-162F-B5B86872F1DE}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SignCheck", "Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj", "{55C6C9BF-ED45-4BE2-B122-1BD989DFEB7F}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheckLibrary", "Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj", "{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignCheck", "SignCheck", "{D8339024-BB1A-8F47-539A-ACF3F6EBF1D1}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheck", "SignCheck\Microsoft.DotNet.SignCheck.csproj", "{21E7EEA3-78BF-4087-9954-3AE67C3D496C}"
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SignCheckTask", "SignCheckTask", "{2DC3DF24-5ED9-C6AB-8979-11D5B8524D15}"
15+
EndProject
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.SignCheckTask", "SignCheckTask\Microsoft.DotNet.SignCheckTask.csproj", "{834EAA78-032E-496E-9F45-9C86E6ED157B}"
917
EndProject
1018
Global
1119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Debug|x64 = Debug|x64
1222
Debug|x86 = Debug|x86
23+
Release|Any CPU = Release|Any CPU
24+
Release|x64 = Release|x64
1325
Release|x86 = Release|x86
1426
EndGlobalSection
1527
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{FA490389-CA35-41B4-8EEA-15DB39093716}.Debug|x86.ActiveCfg = Debug|x86
17-
{FA490389-CA35-41B4-8EEA-15DB39093716}.Debug|x86.Build.0 = Debug|x86
18-
{FA490389-CA35-41B4-8EEA-15DB39093716}.Release|x86.ActiveCfg = Release|x86
19-
{FA490389-CA35-41B4-8EEA-15DB39093716}.Release|x86.Build.0 = Release|x86
20-
{55C6C9BF-ED45-4BE2-B122-1BD989DFEB7F}.Debug|x86.ActiveCfg = Debug|x86
21-
{55C6C9BF-ED45-4BE2-B122-1BD989DFEB7F}.Debug|x86.Build.0 = Debug|x86
22-
{55C6C9BF-ED45-4BE2-B122-1BD989DFEB7F}.Release|x86.ActiveCfg = Release|x86
23-
{55C6C9BF-ED45-4BE2-B122-1BD989DFEB7F}.Release|x86.Build.0 = Release|x86
28+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|x64.ActiveCfg = Debug|Any CPU
31+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|x64.Build.0 = Debug|Any CPU
32+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|x86.ActiveCfg = Debug|Any CPU
33+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Debug|x86.Build.0 = Debug|Any CPU
34+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|x64.ActiveCfg = Release|Any CPU
37+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|x64.Build.0 = Release|Any CPU
38+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|x86.ActiveCfg = Release|Any CPU
39+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3}.Release|x86.Build.0 = Release|Any CPU
40+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|x64.ActiveCfg = Debug|Any CPU
43+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|x64.Build.0 = Debug|Any CPU
44+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|x86.ActiveCfg = Debug|Any CPU
45+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Debug|x86.Build.0 = Debug|Any CPU
46+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|x64.ActiveCfg = Release|Any CPU
49+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|x64.Build.0 = Release|Any CPU
50+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|x86.ActiveCfg = Release|Any CPU
51+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C}.Release|x86.Build.0 = Release|Any CPU
52+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|x64.ActiveCfg = Debug|Any CPU
55+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|x64.Build.0 = Debug|Any CPU
56+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|x86.ActiveCfg = Debug|Any CPU
57+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Debug|x86.Build.0 = Debug|Any CPU
58+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|x64.ActiveCfg = Release|Any CPU
61+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|x64.Build.0 = Release|Any CPU
62+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|x86.ActiveCfg = Release|Any CPU
63+
{834EAA78-032E-496E-9F45-9C86E6ED157B}.Release|x86.Build.0 = Release|Any CPU
2464
EndGlobalSection
2565
GlobalSection(SolutionProperties) = preSolution
2666
HideSolutionNode = FALSE
2767
EndGlobalSection
28-
GlobalSection(ExtensibilityGlobals) = postSolution
29-
SolutionGuid = {4B2E85BD-1C2C-41C3-87F0-D753E5D809D1}
68+
GlobalSection(NestedProjects) = preSolution
69+
{CBE112E8-93E4-4C42-9E16-464F8AC68EB3} = {CD7E959D-5591-47DF-162F-B5B86872F1DE}
70+
{21E7EEA3-78BF-4087-9954-3AE67C3D496C} = {D8339024-BB1A-8F47-539A-ACF3F6EBF1D1}
71+
{834EAA78-032E-496E-9F45-9C86E6ED157B} = {2DC3DF24-5ED9-C6AB-8979-11D5B8524D15}
3072
EndGlobalSection
3173
EndGlobal

‎src/SignCheck/SignCheck/Microsoft.DotNet.SignCheck.csproj

+5-25
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="$(MSBuildThisFileDirectory)..\Microsoft.SignCheck\ResxWorkaround.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
6+
<TargetFramework>$(NetFrameworkToolCurrent)</TargetFramework>
77
<OutputType>Exe</OutputType>
8-
<Platforms>x86</Platforms>
9-
<IsTool>True</IsTool>
8+
<IsTool>true</IsTool>
109
<SignAssembly>false</SignAssembly>
1110
<IsPackable>true</IsPackable>
12-
<!-- Build Tasks should not include any dependencies -->
11+
<!-- <NoWarn>$(NoWarn);NU5128</NoWarn> -->
1312
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1413
<Description>Build artifact signing validation tool</Description>
1514
<PackageTags>Arcade Signing Validation Tool</PackageTags>
@@ -18,26 +17,7 @@
1817

1918
<ItemGroup>
2019
<PackageReference Include="CommandLineParser" Publish="true" />
21-
<PackageReference Include="Microsoft.Build.Utilities.Core" />
22-
<ProjectReference Include="..\Microsoft.SignCheck\Microsoft.DotNet.SignCheckLibrary.csproj" Publish="true" />
23-
</ItemGroup>
24-
25-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
26-
<Reference Include="System.Net.Http" />
27-
<Compile Include="..\..\Common\Internal\AssemblyResolution.cs" Link="src\AssemblyResolution.cs" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<Compile Update="SignCheckResources.Designer.cs"
32-
DesignTime="True"
33-
AutoGen="True"
34-
DependentUpon="SignCheckResources.resx" />
35-
</ItemGroup>
36-
37-
<ItemGroup>
38-
<EmbeddedResource Update="SignCheckResources.resx"
39-
Generator="ResXFileCodeGenerator"
40-
LastGenOutput="SignCheckResources.Designer.cs" />
20+
<ProjectReference Include="..\SignCheckTask\Microsoft.DotNet.SignCheckTask.csproj" />
4121
</ItemGroup>
4222

4323
<!-- This glob must run after the build and before _GetPackageFiles to ensure all dependencies end up in the .nupkg file. -->

0 commit comments

Comments
 (0)