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

Commit b1958bd

Browse files
committed
Revert "Convert WPF assemblies to new csproj format."
This reverts commit aeca53a.
1 parent aeca53a commit b1958bd

File tree

19 files changed

+759
-82
lines changed

19 files changed

+759
-82
lines changed

GitHubVS.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = Debug|Any CPU
148-
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|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
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 = Debug|Any CPU
158-
{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|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
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 = Debug|Any CPU
338-
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|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
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

src/CredentialManagement/CredentialManagement.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
<PropertyGroup>
33
<TargetFramework>net461</TargetFramework>
44
</PropertyGroup>
5-
6-
<Import Project="$(SolutionDir)\src\common\extension.props" />
7-
5+
<Import Project="$(SolutionDir)\src\common\signing.props" />
86
<ItemGroup>
97
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
108
</ItemGroup>
11-
129
<ItemGroup>
1310
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj" />
1411
</ItemGroup>

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net461</TargetFramework>
44
</PropertyGroup>
55

6-
<Import Project="$(SolutionDir)\src\common\extension.props" />
6+
<Import Project="$(SolutionDir)\src\common\signing.props" />
77

88
<ItemGroup Condition="$(Buildtype) == 'Internal'">
99
<Compile Remove="ApiClientConfiguration_User.cs" />

src/GitHub.App/GitHub.App.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net461</TargetFramework>
44
</PropertyGroup>
55

6-
<Import Project="$(SolutionDir)\src\common\extension.props" />
6+
<Import Project="$(SolutionDir)\src\common\signing.props" />
77

88
<ItemGroup>
99
<Reference Include="System.ComponentModel.Composition" />

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>GitHub</RootNamespace>
55
</PropertyGroup>
66

7-
<Import Project="$(SolutionDir)\src\common\extension.props" />
7+
<Import Project="$(SolutionDir)\src\common\signing.props" />
88

99
<ItemGroup>
1010
<Reference Include="System.ComponentModel.Composition" />

src/GitHub.Exports/GitHub.Exports.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>GitHub</RootNamespace>
55
</PropertyGroup>
66

7-
<Import Project="$(SolutionDir)\src\common\extension.props" />
7+
<Import Project="$(SolutionDir)\src\common\signing.props" />
88

99
<ItemGroup>
1010
<Reference Include="System.ComponentModel.Composition" />

src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>GitHub</RootNamespace>
55
</PropertyGroup>
66

7-
<Import Project="$(SolutionDir)\src\common\extension.props" />
7+
<Import Project="$(SolutionDir)\src\common\signing.props" />
88

99
<ItemGroup>
1010
<ProjectReference Include="..\..\submodules\reactiveui\ReactiveUI\ReactiveUI_Net45.csproj" />

src/GitHub.Extensions/GitHub.Extensions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<TargetFramework>net461</TargetFramework>
44
<RootNamespace>GitHub</RootNamespace>
55
</PropertyGroup>
6-
7-
<Import Project="$(SolutionDir)\src\common\extension.props" />
6+
7+
<Import Project="$(SolutionDir)\src\common\signing.props" />
88

99
<ItemGroup>
1010
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

src/GitHub.Logging/GitHub.Logging.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>GitHub</RootNamespace>
55
</PropertyGroup>
66

7-
<Import Project="$(SolutionDir)\src\common\extension.props" />
7+
<Import Project="$(SolutionDir)\src\common\signing.props" />
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />

src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net461</TargetFramework>
44
</PropertyGroup>
55

6-
<Import Project="$(SolutionDir)\src\common\extension.props" />
6+
<Import Project="$(SolutionDir)\src\common\signing.props" />
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />

0 commit comments

Comments
 (0)