Skip to content

Commit e3ad844

Browse files
author
Maddie Clayton
authored
Merge pull request #137 from maddieclayton/removeCRT
Remove CRT dependency
2 parents 21b5b5a + 35a7b14 commit e3ad844

File tree

1,796 files changed

+74
-542812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,796 files changed

+74
-542812
lines changed

‎Azure.PowerShell.Common.sln

+1-116
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,22 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2027
4+
VisualStudioVersion = 15.0.27130.2020
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "src\Common\Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "src\Authentication\Authentication.csproj", "{D3804B64-C0D3-48F8-82EC-1F632F833C9E}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Abstractions", "src\Authentication.Abstractions\Authentication.Abstractions.csproj", "{70527617-7598-4AEF-B5BD-DB9186B8184B}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authorization", "src\Authorization\Authorization.csproj", "{24508E26-154D-47F1-80EE-439BF0710996}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compute", "src\Compute\Compute.csproj", "{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Graph.Rbac", "src\Graph.Rbac\Graph.Rbac.csproj", "{269ACF73-0A34-42DC-AB9C-4B15931A489D}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyVault", "src\KeyVault\KeyVault.csproj", "{836965C0-B198-4D01-B3D7-757DB62B49A0}"
19-
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Network", "src\Network\Network.csproj", "{1338F7AE-7111-4ED3-8916-2D0FECC876F4}"
21-
EndProject
2212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage", "src\Storage\Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}"
2313
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Management", "src\Storage.Management\Storage.Management.csproj", "{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}"
25-
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Websites", "src\Websites\Websites.csproj", "{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}"
27-
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "src\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{69C2EB6B-CD63-480A-89A0-C489706E9299}"
29-
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strategies", "src\Strategies\Strategies.csproj", "{EEA69772-D41B-482A-9252-2B4595C59E53}"
31-
EndProject
32-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceManager", "src\ResourceManager\ResourceManager.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}"
33-
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioTest.ResourceManager", "src\ScenarioTest.ResourceManager\ScenarioTest.ResourceManager.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}"
35-
EndProject
36-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aks", "src\Aks\Aks.csproj", "{87BA5687-5563-4491-8846-77D98D0605D3}"
37-
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomAttributes.Test", "src\CustomAttributes.Test\CustomAttributes.Test.csproj", "{696C6B43-B5E0-4775-B493-3A971D0C38C8}"
39-
EndProject
4014
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceManagement", "src\ServiceManagement\ServiceManagement.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
4115
EndProject
4216
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{625CE04D-FD62-471D-BBCF-E7B716B5FE56}"
4317
EndProject
44-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Test", "src\Common.Test\Common.Test.csproj", "{3B48A77B-5956-4A62-9081-92BA04B02B27}"
45-
EndProject
46-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.Test", "src\Authentication.Test\Authentication.Test.csproj", "{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D}"
47-
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compute.Test", "src\Compute.Test\Compute.Test.csproj", "{8A4E00AA-5F65-4A95-B9B0-FEC06486555E}"
49-
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strategies.Test", "src\Strategies.Test\Strategies.Test.csproj", "{6756A7F2-1141-4065-BA23-0C555D2A2BC3}"
51-
EndProject
5218
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioTest", "src\ScenarioTest\ScenarioTest.csproj", "{C1BDA476-A5CC-4394-914D-48B0EC31A710}"
5319
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFx", "src\TestFx\TestFx.csproj", "{8C625DE3-0067-454A-AF2C-EFD672EEB31A}"
55-
EndProject
5620
Global
5721
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5822
Debug|Any CPU = Debug|Any CPU
@@ -71,101 +35,22 @@ Global
7135
{70527617-7598-4AEF-B5BD-DB9186B8184B}.Debug|Any CPU.Build.0 = Debug|Any CPU
7236
{70527617-7598-4AEF-B5BD-DB9186B8184B}.Release|Any CPU.ActiveCfg = Release|Any CPU
7337
{70527617-7598-4AEF-B5BD-DB9186B8184B}.Release|Any CPU.Build.0 = Release|Any CPU
74-
{24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75-
{24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.Build.0 = Debug|Any CPU
76-
{24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.ActiveCfg = Release|Any CPU
77-
{24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79-
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
80-
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
81-
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Release|Any CPU.Build.0 = Release|Any CPU
82-
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83-
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.Build.0 = Debug|Any CPU
84-
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.ActiveCfg = Release|Any CPU
85-
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.Build.0 = Release|Any CPU
86-
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
87-
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
88-
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
89-
{836965C0-B198-4D01-B3D7-757DB62B49A0}.Release|Any CPU.Build.0 = Release|Any CPU
90-
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91-
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
92-
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
93-
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.Build.0 = Release|Any CPU
9438
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9539
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
9640
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
9741
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU
98-
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99-
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
100-
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
101-
{4CCA7339-15BF-4066-9FA1-6A23A58F2CEE}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103-
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Debug|Any CPU.Build.0 = Debug|Any CPU
104-
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.ActiveCfg = Release|Any CPU
105-
{592B3E1B-49E3-4F3C-BF6B-E5D4133B1443}.Release|Any CPU.Build.0 = Release|Any CPU
106-
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107-
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Debug|Any CPU.Build.0 = Debug|Any CPU
108-
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.ActiveCfg = Release|Any CPU
109-
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.Build.0 = Release|Any CPU
110-
{EEA69772-D41B-482A-9252-2B4595C59E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
111-
{EEA69772-D41B-482A-9252-2B4595C59E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
112-
{EEA69772-D41B-482A-9252-2B4595C59E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
113-
{EEA69772-D41B-482A-9252-2B4595C59E53}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU
116-
{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU
117-
{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU
118-
{3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119-
{3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU
120-
{3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU
121-
{3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU
122-
{87BA5687-5563-4491-8846-77D98D0605D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123-
{87BA5687-5563-4491-8846-77D98D0605D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
124-
{87BA5687-5563-4491-8846-77D98D0605D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
125-
{87BA5687-5563-4491-8846-77D98D0605D3}.Release|Any CPU.Build.0 = Release|Any CPU
126-
{696C6B43-B5E0-4775-B493-3A971D0C38C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127-
{696C6B43-B5E0-4775-B493-3A971D0C38C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
128-
{696C6B43-B5E0-4775-B493-3A971D0C38C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
129-
{696C6B43-B5E0-4775-B493-3A971D0C38C8}.Release|Any CPU.Build.0 = Release|Any CPU
13042
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13143
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
13244
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
13345
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU
134-
{3B48A77B-5956-4A62-9081-92BA04B02B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135-
{3B48A77B-5956-4A62-9081-92BA04B02B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
136-
{3B48A77B-5956-4A62-9081-92BA04B02B27}.Release|Any CPU.ActiveCfg = Release|Any CPU
137-
{3B48A77B-5956-4A62-9081-92BA04B02B27}.Release|Any CPU.Build.0 = Release|Any CPU
138-
{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139-
{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
140-
{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
141-
{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D}.Release|Any CPU.Build.0 = Release|Any CPU
142-
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143-
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E}.Debug|Any CPU.Build.0 = Debug|Any CPU
144-
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E}.Release|Any CPU.ActiveCfg = Release|Any CPU
145-
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E}.Release|Any CPU.Build.0 = Release|Any CPU
146-
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
147-
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
148-
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
149-
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.Build.0 = Release|Any CPU
15046
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15147
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Debug|Any CPU.Build.0 = Debug|Any CPU
15248
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.ActiveCfg = Release|Any CPU
15349
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.Build.0 = Release|Any CPU
154-
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155-
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Debug|Any CPU.Build.0 = Debug|Any CPU
156-
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Release|Any CPU.ActiveCfg = Release|Any CPU
157-
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Release|Any CPU.Build.0 = Release|Any CPU
15850
EndGlobalSection
15951
GlobalSection(SolutionProperties) = preSolution
16052
HideSolutionNode = FALSE
16153
EndGlobalSection
162-
GlobalSection(NestedProjects) = preSolution
163-
{696C6B43-B5E0-4775-B493-3A971D0C38C8} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
164-
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
165-
{C2CF99A2-D35E-4AED-AFB9-C26960AF1D0D} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
166-
{8A4E00AA-5F65-4A95-B9B0-FEC06486555E} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
167-
{6756A7F2-1141-4065-BA23-0C555D2A2BC3} = {625CE04D-FD62-471D-BBCF-E7B716B5FE56}
168-
EndGlobalSection
16954
GlobalSection(ExtensibilityGlobals) = postSolution
17055
SolutionGuid = {D4C68FE4-3D0C-4F70-B5BA-499E0C0F177E}
17156
EndGlobalSection

‎build/build.proj

+21-12
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,33 @@
3737
</Target>
3838

3939
<Target Name="netstandard20">
40-
<Message Importance="high" Text="Build: netstandard20 started" />
40+
<Message Importance="high" Text="Build: net452 started" />
4141
<PropertyGroup>
42-
<Solution>$(Root)Azure.PowerShell.Common.Netcore.sln</Solution>
43-
<TestOutput>$(Artifacts)Test\</TestOutput>
44-
<FileVersion Condition="'$(FileVersion)' == ''">1.0.0.0</FileVersion>
45-
<AssemblyVersion Condition="'$(AssemblyVersion)' == ''">1.0.0.0</AssemblyVersion>
42+
<Framework>net452</Framework>
43+
<Tools>$(Root)tools\</Tools>
44+
<NuGet>$(Tools)NuGet-4.7.0\nuget.exe</NuGet>
45+
<Solution>$(Root)Azure.PowerShell.Common.sln</Solution>
46+
<NuGetConfig>$(Root)NuGet.config</NuGetConfig>
47+
<OutputDir>$(Artifacts)$(Configuration)\$(Framework)\</OutputDir>
48+
<xUnitRunner>$(Tools)xunit.runner.console.2.3.1\$(Framework)\xunit.console.exe</xUnitRunner>
49+
<TestOutput>$(Artifacts)Test\$(Framework)\TestResults.html</TestOutput>
4650
</PropertyGroup>
4751

48-
<Message Importance="high" Text="netstandard20: Building $([System.IO.Path]::GetFileName($(Solution)))" />
49-
<Exec Command="dotnet build $(Solution) -c $(Configuration) /p:FileVersion=$(FileVersion) /p:AssemblyVersion=$(AssemblyVersion) -NoLogo" />
52+
<Message Importance="high" Text="net452: Restoring $([System.IO.Path]::GetFileName($(Solution)))" />
53+
<Exec Command="$(NuGet) restore $(Solution) -ConfigFile $(NuGetConfig)" />
54+
<Message Importance="high" Text="net452: Building $([System.IO.Path]::GetFileName($(Solution)))" />
55+
<MSBuild Projects="$(Solution)" Properties="Configuration=$(Configuration)" />
5056

51-
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="netstandard20: Testing $([System.IO.Path]::GetFileName($(Solution)))" />
52-
<Exec Condition="'$(Configuration)' == 'Debug'" Command="dotnet test $(Solution) --filter $(TestFilter) --configuration $(Configuration) --logger trx -NoLogo" ContinueOnError="ErrorAndContinue" />
57+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
58+
<CurrentDate>$([System.DateTime]::Now.ToString(yyyy-MM-dd_hh_mm_ss))</CurrentDate>
59+
<TestOutput>$(Artifacts)Test\$(Framework)\TestResults_$(CurrentDate).html</TestOutput>
60+
</PropertyGroup>
5361
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
54-
<TestResults Include="$(Root)src\**\TestResults\*.trx" />
62+
<TestAssemblies Include="$(OutputDir)*.Tests.dll;$(OutputDir)*.Test.dll;$(OutputDir)*.UnitTest.dll" />
5563
</ItemGroup>
56-
<Move Condition="'$(Configuration)' == 'Debug'" SourceFiles="@(TestResults)" DestinationFolder="$(TestOutput)" />
64+
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" />
65+
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)" />
5766
</Target>
5867

59-
<Target Name="All" DependsOnTargets="net452;netstandard20" />
68+
<Target Name="All" DependsOnTargets="net452" />
6069
</Project>

‎build/pack.proj

+8-4
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@
2323
</Target>
2424

2525
<Target Name="netstandard20">
26-
<Message Importance="high" Text="Pack: netstandard20 started" />
26+
<Message Importance="high" Text="Pack: net452 started" />
27+
<PropertyGroup>
28+
<NuGet>$(Tools)NuGet-4.7.0\nuget.exe</NuGet>
29+
</PropertyGroup>
30+
2731
<ItemGroup>
28-
<NetStandard20Projects Include="$(Src)**\*.Netcore.csproj" Exclude="$(Src)**\*.Tests.Netcore.csproj;$(Src)**\*.Test.Netcore.csproj;$(Src)**\*.UnitTest.Netcore.csproj" />
32+
<Net452Projects Include="$(Src)**\*.csproj" Exclude="$(Src)**\*.Netcore.csproj;$(Src)**\*.Tests.csproj;$(Src)**\*.Test.csproj;$(Src)**\*.UnitTest.csproj" />
2933
</ItemGroup>
30-
<Exec Command="dotnet pack %(NetStandard20Projects.FullPath) -c $(Configuration) /p:PackageVersion=$(PackageVersion)-preview --no-build" />
34+
<Exec Command="$(NuGet) pack %(Net452Projects.FullPath) -OutputDirectory $(Net452PackDir) -Properties Configuration=$(Configuration) -Version $(PackageVersion)-preview -IncludeReferencedProjects" />
3135
</Target>
3236

33-
<Target Name="All" DependsOnTargets="net452;netstandard20">
37+
<Target Name="All" DependsOnTargets="net452">
3438
<Message Importance="high" Text="Pack: NupkgMerge started" />
3539
<PropertyGroup>
3640
<NupkgMerge>$(Tools)NupkgMerge\NupkgMerge.exe</NupkgMerge>

0 commit comments

Comments
 (0)