Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 7f97764

Browse files
grokysgrokys
committed
Use MSBuild.Sdk.Extras for WPF projects.
1 parent 8834657 commit 7f97764

File tree

8 files changed

+56
-749
lines changed

8 files changed

+56
-749
lines changed

‎GitHubVS.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.14",
8989
EndProject
9090
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.15", "src\GitHub.TeamFoundation.15\GitHub.TeamFoundation.15.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720E}"
9191
EndProject
92-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}"
92+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}"
9393
EndProject
9494
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage", "src\GitHub.StartPage\GitHub.StartPage.csproj", "{50E277B8-8580-487A-8F8E-5C3B9FBF0F77}"
9595
EndProject
@@ -144,8 +144,8 @@ Global
144144
{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.ReleaseWithoutVsix|Any CPU.Build.0 = ReleaseWithoutVsix|Any CPU
145145
{346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146146
{346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.Build.0 = Debug|Any CPU
147-
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
148-
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
147+
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
148+
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
149149
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
150150
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
151151
{346384DD-2445-4A28-AF22-B45F3957BD89}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -154,8 +154,8 @@ Global
154154
{346384DD-2445-4A28-AF22-B45F3957BD89}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
155155
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
156156
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
157-
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
158-
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
157+
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
158+
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
159159
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
160160
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
161161
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -334,8 +334,8 @@ Global
334334
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
335335
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
336336
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.Build.0 = Debug|Any CPU
337-
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
338-
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU
337+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
338+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
339339
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
340340
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
341341
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎global.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"msbuild-sdks": {
3+
"MSBuild.Sdk.Extras": "1.6.47"
4+
}
5+
}

‎src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj

+13-181
Original file line numberDiff line numberDiff line change
@@ -1,195 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="MSBuild.Sdk.Extras">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}</ProjectGuid>
8-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
3+
<TargetFramework>net461</TargetFramework>
114
<RootNamespace>GitHub</RootNamespace>
12-
<AssemblyName>GitHub.UI.Reactive</AssemblyName>
13-
<LangVersion>7.3</LangVersion>
14-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<CodeAnalysisRuleSet>..\common\GitHubVS.ruleset</CodeAnalysisRuleSet>
17-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18-
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<RunCodeAnalysis>false</RunCodeAnalysis>
28-
<OutputPath>bin\Debug\</OutputPath>
29-
</PropertyGroup>
30-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
31-
<DebugSymbols>true</DebugSymbols>
32-
<DebugType>full</DebugType>
33-
<Optimize>false</Optimize>
34-
<DefineConstants>CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
<RunCodeAnalysis>true</RunCodeAnalysis>
38-
<OutputPath>bin\Debug\</OutputPath>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
41-
<DebugType>pdbonly</DebugType>
42-
<Optimize>true</Optimize>
43-
<DefineConstants>TRACE</DefineConstants>
44-
<ErrorReport>prompt</ErrorReport>
45-
<WarningLevel>4</WarningLevel>
46-
<RunCodeAnalysis>true</RunCodeAnalysis>
47-
<OutputPath>bin\Release\</OutputPath>
5+
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
486
</PropertyGroup>
7+
498
<Import Project="$(SolutionDir)\src\common\signing.props" />
9+
5010
<ItemGroup>
51-
<Reference Include="PresentationCore" />
52-
<Reference Include="PresentationFramework" />
53-
<Reference Include="System" />
5411
<Reference Include="System.ComponentModel.DataAnnotations" />
55-
<Reference Include="System.Core" />
56-
<Reference Include="System.Interactive">
57-
<HintPath>..\..\packages\Ix_Experimental-Main.1.1.10823\lib\Net4\System.Interactive.dll</HintPath>
58-
</Reference>
59-
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
67-
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll</HintPath>
69-
<Private>True</Private>
70-
</Reference>
71-
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
73-
<Private>True</Private>
74-
</Reference>
75-
<Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
76-
<HintPath>..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
77-
<Private>True</Private>
78-
</Reference>
7912
<Reference Include="System.Xaml" />
80-
<Reference Include="System.Xml.Linq" />
81-
<Reference Include="System.Data.DataSetExtensions" />
82-
<Reference Include="Microsoft.CSharp" />
83-
<Reference Include="System.Data" />
84-
<Reference Include="System.Xml" />
13+
<Reference Include="PresentationCore" />
14+
<Reference Include="PresentationFramework" />
8515
<Reference Include="WindowsBase" />
8616
</ItemGroup>
17+
8718
<ItemGroup>
88-
<Compile Include="Controls\ViewBase.cs" />
89-
<Compile Include="Controls\TwoFactorInput.xaml.cs">
90-
<DependentUpon>TwoFactorInput.xaml</DependentUpon>
91-
</Compile>
92-
<Compile Include="GlobalSuppressions.cs" />
93-
<Compile Include="Helpers\FocusHelper.cs" />
94-
<Compile Include="Properties\AssemblyInfo.cs" />
95-
<Compile Include="..\common\SolutionInfo.cs">
96-
<Link>Properties\SolutionInfo.cs</Link>
97-
</Compile>
98-
</ItemGroup>
99-
<ItemGroup>
100-
<Compile Include="Controls\BindingExtensions.cs" />
101-
<Compile Include="Controls\Validation\UserErrorMessages.cs" />
102-
<Compile Include="Controls\Validation\ValidationMessage.cs" />
103-
<Compile Include="Controls\ErrorMessageDisplay.cs" />
104-
<Compile Include="Controls\FilteredComboBox.cs" />
105-
<Compile Include="Controls\GitHubTabControl.cs" />
106-
<Compile Include="Validation\ReactiveValidatableObject.cs" />
107-
<Compile Include="Validation\ValidateIfAttribute.cs" />
108-
</ItemGroup>
109-
<ItemGroup>
110-
<Page Include="Assets\Controls.xaml">
111-
<Generator>MSBuild:Compile</Generator>
112-
<SubType>Designer</SubType>
113-
</Page>
114-
<Page Include="Assets\Controls\ErrorMessageDisplay.xaml">
115-
<Generator>MSBuild:Compile</Generator>
116-
<SubType>Designer</SubType>
117-
</Page>
118-
<Page Include="Assets\Controls\FilteredComboBox.xaml">
119-
<Generator>MSBuild:Compile</Generator>
120-
<SubType>Designer</SubType>
121-
</Page>
122-
<Page Include="Assets\Controls\GitHubComboBox.xaml">
123-
<Generator>MSBuild:Compile</Generator>
124-
<SubType>Designer</SubType>
125-
</Page>
126-
<Page Include="Assets\Controls\GitHubTabControl.xaml">
127-
<Generator>MSBuild:Compile</Generator>
128-
<SubType>Designer</SubType>
129-
</Page>
130-
<Page Include="Assets\Controls\Validation\UserErrorMessages.xaml">
131-
<Generator>MSBuild:Compile</Generator>
132-
<SubType>Designer</SubType>
133-
</Page>
134-
<Page Include="Assets\Controls\Validation\ValidationMessage.xaml">
135-
<Generator>MSBuild:Compile</Generator>
136-
<SubType>Designer</SubType>
137-
</Page>
138-
<Page Include="Controls\TwoFactorInput.xaml">
139-
<Generator>MSBuild:Compile</Generator>
140-
<SubType>Designer</SubType>
141-
</Page>
142-
<Page Include="SharedDictionary.xaml">
143-
<Generator>MSBuild:Compile</Generator>
144-
</Page>
145-
</ItemGroup>
146-
<ItemGroup>
147-
<None Include="packages.config" />
19+
<ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI.Events\ReactiveUI.Events_Net45.csproj" />
20+
<ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj" />
21+
<ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj" />
14822
</ItemGroup>
23+
14924
<ItemGroup>
150-
<ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI.Events\ReactiveUI.Events_Net45.csproj">
151-
<Project>{600998c4-54dd-4755-bfa8-6f44544d8e2e}</Project>
152-
<Name>ReactiveUI.Events_Net45</Name>
153-
</ProjectReference>
154-
<ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI\ReactiveUI_Net45.csproj">
155-
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
156-
<Name>ReactiveUI_Net45</Name>
157-
</ProjectReference>
158-
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
159-
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
160-
<Name>Splat-Net45</Name>
161-
</ProjectReference>
162-
<ProjectReference Include="..\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj">
163-
<Project>{e4ed0537-d1d9-44b6-9212-3096d7c3f7a1}</Project>
164-
<Name>GitHub.Exports.Reactive</Name>
165-
</ProjectReference>
166-
<ProjectReference Include="..\GitHub.Exports\GitHub.Exports.csproj">
167-
<Project>{9aea02db-02b5-409c-b0ca-115d05331a6b}</Project>
168-
<Name>GitHub.Exports</Name>
169-
</ProjectReference>
170-
<ProjectReference Include="..\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj">
171-
<Project>{6559E128-8B40-49A5-85A8-05565ED0C7E3}</Project>
172-
<Name>GitHub.Extensions.Reactive</Name>
173-
</ProjectReference>
174-
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
175-
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
176-
<Name>GitHub.Extensions</Name>
177-
</ProjectReference>
178-
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
179-
<Project>{8d73575a-a89f-47cc-b153-b47dd06837f0}</Project>
180-
<Name>GitHub.Logging</Name>
181-
</ProjectReference>
182-
<ProjectReference Include="..\GitHub.UI\GitHub.UI.csproj">
183-
<Project>{346384DD-2445-4A28-AF22-B45F3957BD89}</Project>
184-
<Name>GitHub.UI</Name>
185-
</ProjectReference>
25+
<PackageReference Include="Ix_Experimental-Main" version="1.1.10823" />
18626
</ItemGroup>
187-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
188-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
189-
Other similar extension points exist, see Microsoft.Common.targets.
190-
<Target Name="BeforeBuild">
191-
</Target>
192-
<Target Name="AfterBuild">
193-
</Target>
194-
-->
19527
</Project>

‎src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
using System.Reflection;
2-
using System.Runtime.InteropServices;
3-
using System.Windows;
1+
using System.Windows;
42
using System.Windows.Markup;
53

6-
[assembly: AssemblyTitle("GitHub.UI.Reactive")]
7-
[assembly: AssemblyDescription("GitHub flavored WPF styles and controls that require Rx and RxUI")]
8-
[assembly: Guid("885a491c-1d13-49e7-baa6-d61f424befcb")]
9-
104
[assembly: ThemeInfo(
115
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
126
//(used if a resource is not found in the page,

0 commit comments

Comments
 (0)