Skip to content

Commit 78ad38f

Browse files
author
Paul van Brenk
committed
Fix Build break
1 parent a17e34a commit 78ad38f

File tree

7 files changed

+203
-121
lines changed

7 files changed

+203
-121
lines changed

Nodejs/Product/Nodejs/SharedProject/Wpf/LambdaConverter/ILambdaConverterProvider.cs renamed to Common/Product/SharedProject/ILambdaConverterProvider.cs

File renamed without changes.

Nodejs/Product/Nodejs/SharedProject/Wpf/LambdaConverter/LambdaConverter.cs renamed to Common/Product/SharedProject/LambdaConverter.cs

File renamed without changes.

Common/Tools/BuildTasks/BuildTasks.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<BuildRoot Condition="'$(BuildRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
5-
<OutputPathSuffix Condition="'$(OutputPathSuffix)' == ''">ToolBinaries\$(MSBuildProjectName)\</OutputPathSuffix>
6-
<IntermediateOutputPathSuffix>obj\ToolBinaries\$(MSBuildProjectName)\</IntermediateOutputPathSuffix>
5+
<OutputPathSuffix Condition="'$(OutputPathSuffix)' == ''">ToolBinaries\$(MSBuildProjectName)\</OutputPathSuffix>
6+
<IntermediateOutputPathSuffix>obj\ToolBinaries\$(MSBuildProjectName)\</IntermediateOutputPathSuffix>
77
</PropertyGroup>
88
<Import Project="$(BuildRoot)\Build\Common.Build.settings" />
9-
109
<PropertyGroup>
1110
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1211
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -57,10 +56,10 @@
5756
<Reference Include="WindowsBase" />
5857
</ItemGroup>
5958
<ItemGroup>
60-
<Compile Include="..\..\Product\SharedProject\Wpf\LambdaConverter\ILambdaConverterProvider.cs">
59+
<Compile Include="..\..\Product\SharedProject\ILambdaConverterProvider.cs">
6160
<Link>ILambdaConverterProvider.cs</Link>
6261
</Compile>
63-
<Compile Include="..\..\Product\SharedProject\Wpf\LambdaConverter\LambdaConverter.cs">
62+
<Compile Include="..\..\Product\SharedProject\LambdaConverter.cs">
6463
<Link>LambdaConverter.cs</Link>
6564
</Compile>
6665
<Compile Include="ExtractLambdasFromXaml.cs" />

Common/Tools/BuildTasks/ExtractLambdasFromXaml.cs

Lines changed: 192 additions & 104 deletions
Large diffs are not rendered by default.

Nodejs/Product/Nodejs/Nodejs.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,12 @@
229229
<Compile Include="..\..\..\Common\Product\SharedProject\ExceptionExtensions.cs">
230230
<Link>SharedProject\ExceptionExtensions.cs</Link>
231231
</Compile>
232+
<Compile Include="..\..\..\Common\Product\SharedProject\ILambdaConverterProvider.cs">
233+
<Link>SharedProject\Wpf\LambdaConverter\ILambdaConverterProvider.cs</Link>
234+
</Compile>
235+
<Compile Include="..\..\..\Common\Product\SharedProject\LambdaConverter.cs">
236+
<Link>SharedProject\Wpf\LambdaConverter\LambdaConverter.cs</Link>
237+
</Compile>
232238
<Compile Include="..\..\..\Common\Product\SharedProject\ProcessOutput.cs">
233239
<Link>SharedProject\ProcessOutput.cs</Link>
234240
</Compile>
@@ -1208,8 +1214,6 @@
12081214
<Generator>MSBuild:Compile</Generator>
12091215
<SubType>Designer</SubType>
12101216
</Page>
1211-
<Compile Include="SharedProject\Wpf\LambdaConverter\ILambdaConverterProvider.cs" />
1212-
<Compile Include="SharedProject\Wpf\LambdaConverter\LambdaConverter.cs" />
12131217
<Compile Include="SharedProject\Wpf\LambdaConverter\LambdaExtension.cs" />
12141218
<Compile Include="SharedProject\Wpf\LambdaConverter\LambdaProperties.cs" />
12151219
</ItemGroup>

Nodejs/Product/Nodejs/SharedProject/Wpf/LambdaConverter/LambdaExtension.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

33
using System;
4-
using System.ComponentModel;
5-
using System.Windows;
64
using System.Windows.Markup;
75
using System.Xaml;
8-
using System.Windows.Data;
9-
using System.Globalization;
10-
using Microsoft.VisualStudioTools.Wpf;
116

127
namespace Microsoft.VisualStudioTools.Wpf
138
{

Nodejs/Product/Nodejs/SharedProject/Wpf/LambdaConverter/LambdaProperties.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

3-
using System;
43
using System.Windows;
54

65
namespace Microsoft.VisualStudioTools.Wpf
@@ -10,10 +9,7 @@ public static class LambdaProperties
109
public static readonly DependencyProperty ImportedNamespacesProperty = DependencyProperty.RegisterAttached(
1110
"ImportedNamespaces", typeof(string), typeof(LambdaProperties));
1211

13-
public static string GetImportedNamespaces(object obj)
14-
{
15-
return null;
16-
}
12+
public static string GetImportedNamespaces(object obj) => null;
1713

1814
public static void SetImportedNamespaces(object obj, string value)
1915
{

0 commit comments

Comments
 (0)