Skip to content

Commit 1eb18b3

Browse files
StevenRasmussenStevenRasmussen
committed
Update 'Microsoft' projects with similar structure to the main 'Community.VisualStudio.Toolkit' repo.
[release]
1 parent 97c461d commit 1eb18b3

12 files changed

+72
-182
lines changed

‎Community.VisualStudio.Toolkit.DependencyInjection.sln‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{3808B5B3-2
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{FB4B0B0F-301D-4B83-A50F-93DCA3D69C4B}"
2323
ProjectSection(SolutionItems) = preProject
24-
src\Microsoft\AssemblyInfo.cs = src\Microsoft\AssemblyInfo.cs
25-
src\Microsoft\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props = src\Microsoft\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props
26-
src\Microsoft\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.targets = src\Microsoft\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.targets
27-
src\Microsoft\DependencyInjection.Microsoft.Common.props = src\Microsoft\DependencyInjection.Microsoft.Common.props
24+
src\Microsoft\Directory.Build.props = src\Microsoft\Directory.Build.props
25+
src\Microsoft\Directory.Build.targets = src\Microsoft\Directory.Build.targets
2826
EndProjectSection
2927
EndProject
3028
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Community.VisualStudio.Toolkit.DependencyInjection.Core.Shared", "src\Core\Shared\Community.VisualStudio.Toolkit.DependencyInjection.Core.Shared.shproj", "{BEB996A4-E7DA-4D44-A21C-493AAF842203}"
@@ -53,7 +51,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{0F000C32
5351
ProjectSection(SolutionItems) = preProject
5452
src\Core\nuget\build\AssemblyInfo.cs = src\Core\nuget\build\AssemblyInfo.cs
5553
src\Core\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Core.props = src\Core\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Core.props
56-
src\Core\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Core.targets = src\Core\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Core.targets
54+
EndProjectSection
55+
EndProject
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{37DD1F28-C4E9-4AF0-BF2F-6C66FE148CA5}"
57+
EndProject
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6672CAAA-DE03-4E57-AA5D-00BE5D0E539E}"
59+
ProjectSection(SolutionItems) = preProject
60+
src\Microsoft\nuget\build\AssemblyInfo.cs = src\Microsoft\nuget\build\AssemblyInfo.cs
61+
src\Microsoft\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props = src\Microsoft\nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props
5762
EndProjectSection
5863
EndProject
5964
Global
@@ -119,6 +124,8 @@ Global
119124
{B884D896-4648-4494-98B7-83B3D858D007} = {FB4B0B0F-301D-4B83-A50F-93DCA3D69C4B}
120125
{3AA98E25-18F3-4CF6-A459-2CC8C3F62FD0} = {3808B5B3-2974-470E-AB36-B6A7424FF4C5}
121126
{0F000C32-1FED-49B8-8A7A-4F126C0937AA} = {3AA98E25-18F3-4CF6-A459-2CC8C3F62FD0}
127+
{37DD1F28-C4E9-4AF0-BF2F-6C66FE148CA5} = {FB4B0B0F-301D-4B83-A50F-93DCA3D69C4B}
128+
{6672CAAA-DE03-4E57-AA5D-00BE5D0E539E} = {37DD1F28-C4E9-4AF0-BF2F-6C66FE148CA5}
122129
EndGlobalSection
123130
GlobalSection(ExtensibilityGlobals) = postSolution
124131
SolutionGuid = {E0DD67C0-2617-498C-81F0-A5E4FF5831F1}

‎src/Microsoft/14.0/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.14.0.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\DependencyInjection.Microsoft.Common.props" />
4-
53
<PropertyGroup>
64
<TargetFramework>net46</TargetFramework>
7-
<DefineConstants>VS14</DefineConstants>
85
<MajorVersion>14</MajorVersion>
96
<PackageId>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.$(MajorVersion)</PackageId>
107
</PropertyGroup>

‎src/Microsoft/15.0/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.15.0.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\DependencyInjection.Microsoft.Common.props" />
4-
53
<PropertyGroup>
64
<TargetFramework>net46</TargetFramework>
7-
<DefineConstants>VS15</DefineConstants>
85
<MajorVersion>15</MajorVersion>
96
<PackageId>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.$(MajorVersion)</PackageId>
107
</PropertyGroup>

‎src/Microsoft/16.0/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.16.0.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\DependencyInjection.Microsoft.Common.props" />
4-
53
<PropertyGroup>
64
<TargetFramework>net472</TargetFramework>
7-
<DefineConstants>VS16</DefineConstants>
85
<MajorVersion>16</MajorVersion>
96
<PackageId>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.$(MajorVersion)</PackageId>
107
</PropertyGroup>

‎src/Microsoft/17.0/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.17.0.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\DependencyInjection.Microsoft.Common.props" />
4-
53
<PropertyGroup>
64
<TargetFramework>net48</TargetFramework>
7-
<DefineConstants>VS17</DefineConstants>
85
<MajorVersion>17</MajorVersion>
96
<PackageId>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.$(MajorVersion)</PackageId>
107
</PropertyGroup>

‎src/Microsoft/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props‎

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

‎src/Microsoft/Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.targets‎

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

‎src/Microsoft/DependencyInjection.Microsoft.Common.props‎

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

‎src/Microsoft/Directory.Build.props‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!-- Toolkit projects. -->
2+
<Project>
3+
4+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
5+
6+
<PropertyGroup>
7+
<AssemblyName>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft</AssemblyName>
8+
<PackageDescription>Microsoft Dependency Injection system for the Community.VisualStudio.Toolkit</PackageDescription>
9+
<PackageTags>VisualStudio, VSSDK, SDK</PackageTags>
10+
<RootNamespace>Community.VisualStudio.Toolkit.DependencyInjection.Microsoft</RootNamespace>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<None Include="$(MSBuildThisFileDirectory)nuget\build\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.props" Pack="true" PackagePath="build\Community.VisualStudio.Toolkit.DependencyInjection.Core.$(MajorVersion).props" Visible="false" />
15+
<None Include="$(MSBuildThisFileDirectory)nuget\build\AssemblyInfo.cs" Pack="true" PackagePath="build" Visible="false" />
16+
17+
<!-- Include all of the files in the "imports" folder. -->
18+
<None Include="$(MSBuildThisFileDirectory)nuget\build\imports\*" Pack="true" PackagePath="build\imports" Visible="false" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Reference Include="PresentationCore" />
23+
<Reference Include="PresentationFramework" />
24+
<Reference Include="System.Design" />
25+
<Reference Include="System.Windows" />
26+
<Reference Include="WindowsBase" />
27+
</ItemGroup>
28+
29+
<Import Project="$(MSBuildThisFileDirectory)Shared\Community.VisualStudio.Toolkit.DependencyInjection.Microsoft.Shared.projitems" Label="Shared" />
30+
31+
</Project>

‎src/Microsoft/Directory.Build.targets‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- Toolkit projects. -->
2+
<Project>
3+
4+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)..\'))" />
5+
6+
<PropertyGroup>
7+
<!--
8+
The major version number has not been set at the point
9+
that the `Directory.Build.props` file is imported,
10+
so we can't define the `VSXX` constant until now.
11+
-->
12+
<DefineConstants>VS$(MajorVersion)</DefineConstants>
13+
</PropertyGroup>
14+
15+
</Project>

0 commit comments

Comments
 (0)