Skip to content

Commit bc836db

Browse files
authored
Rewire VS 2022 extension to SDK build tasks (#933)
1 parent 37f3c5a commit bc836db

10 files changed

Lines changed: 19 additions & 288 deletions

File tree

Tools.BuildTasks-2019/ProcessResourceFiles.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
// Portions Copyright (c) Microsoft Corporation. All rights reserved.
44
// See LICENSE file in the project root for full license information.
55
//
6+
// ******************************************************************************
7+
// ** IMPORTANT: THIS FILE IS DUPLICATED. **
8+
// ** **
9+
// ** A modified copy exists in the nanoFramework SDK repo: **
10+
// ** nf-nanoFramework.Sdk / nanoFramework.Tools.BuildTasks / **
11+
// ** ProcessResourceFiles.cs **
12+
// ** **
13+
// ** The SDK copy carries #if NETFRAMEWORK guards for cross-platform support. **
14+
// ** Any logic change made here MUST be ported there, and vice-versa. **
15+
// ******************************************************************************
616

717
using Microsoft.Build.Framework;
818
using Microsoft.Build.Utilities;

Tools.BuildTasks-2019/Utilities/DebuggerHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public static void WaitForDebuggerIfEnabled(string varName, int timeoutSeconds =
3333
);
3434

3535
// wait N seconds for debugger to attach
36-
while (!Debugger.IsAttached && waitForDebugToAttach.TotalSeconds > 0)
36+
while (!System.Diagnostics.Debugger.IsAttached && waitForDebugToAttach.TotalSeconds > 0)
3737
{
3838
Thread.Sleep(1000);
3939
waitForDebugToAttach -= TimeSpan.FromSeconds(1);
4040
}
4141

42-
Debugger.Break();
42+
System.Diagnostics.Debugger.Break();
4343
}
4444
#endif
4545
}

Tools.BuildTasks-2022/Properties/AssemblyInfo.cs

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

Tools.BuildTasks-2022/Tools.BuildTasks-2022.csproj

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

Tools.BuildTasks-2022/key.snk

-596 Bytes
Binary file not shown.

Tools.BuildTasks-2022/packages.lock.json

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

Tools.BuildTasks-2022/version.json

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

VisualStudio.Extension-2022/VisualStudio.Extension-vs2022.csproj

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
4242
<DebugSymbols>true</DebugSymbols>
4343
<OutputPath>bin\x64\Debug\</OutputPath>
44-
<DefineConstants>TRACE;DEBUG;DEV17;</DefineConstants>
44+
<DefineConstants>TRACE;DEBUG;DEV17</DefineConstants>
4545
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
4646
<DebugType>full</DebugType>
4747
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -50,7 +50,7 @@
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
5252
<OutputPath>bin\x64\Release\</OutputPath>
53-
<DefineConstants>TRACE;DEV17;</DefineConstants>
53+
<DefineConstants>TRACE;DEV17</DefineConstants>
5454
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5555
<Optimize>true</Optimize>
5656
<DebugType>pdbonly</DebugType>
@@ -63,7 +63,7 @@
6363
<DebugType>full</DebugType>
6464
<Optimize>false</Optimize>
6565
<OutputPath>bin\Debug\</OutputPath>
66-
<DefineConstants>TRACE;DEBUG;DEV17;</DefineConstants>
66+
<DefineConstants>TRACE;DEBUG;DEV17</DefineConstants>
6767
<ErrorReport>prompt</ErrorReport>
6868
<WarningLevel>4</WarningLevel>
6969
<DeployExtension>True</DeployExtension>
@@ -76,7 +76,7 @@
7676
<DebugType>pdbonly</DebugType>
7777
<Optimize>true</Optimize>
7878
<OutputPath>bin\Release\</OutputPath>
79-
<DefineConstants>TRACE;DEV17;</DefineConstants>
79+
<DefineConstants>TRACE;DEV17</DefineConstants>
8080
<ErrorReport>prompt</ErrorReport>
8181
<WarningLevel>4</WarningLevel>
8282
<CodeAnalysisRuleSet>
@@ -90,6 +90,9 @@
9090
<Compile Include="..\Tools.BuildTasks-2019\ProcessResourceFiles.cs">
9191
<Link>ResXFileCodeGenerator\ProcessResourceFiles.cs</Link>
9292
</Compile>
93+
<Compile Include="..\Tools.BuildTasks-2019\Utilities\DebuggerHelper.cs">
94+
<Link>DebuggerHelper.cs</Link>
95+
</Compile>
9396
<Compile Include="NanoFrameworkMoniker.cs">
9497
<AutoGen>True</AutoGen>
9598
<DesignTime>True</DesignTime>
@@ -280,13 +283,6 @@
280283
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
281284
<VSIXSubPath>ProjectTemplates</VSIXSubPath>
282285
</ProjectReference>
283-
<ProjectReference Include="..\Tools.BuildTasks-2022\Tools.BuildTasks-2022.csproj">
284-
<Project>{552c2500-2c53-4148-a422-0ed983ef135d}</Project>
285-
<Name>Tools.BuildTasks-2022</Name>
286-
<InstallRoot>MSBuild</InstallRoot>
287-
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup</IncludeOutputGroupsInVSIX>
288-
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
289-
</ProjectReference>
290286
</ItemGroup>
291287
<ItemGroup>
292288
<Resource Include="Resources\DeviceDisconnected.16.16.png" />

VisualStudio.Extension-2022/packages.lock.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,12 +1883,6 @@
18831883
"Microsoft.VisualStudio.Interop": "17.13.40008"
18841884
}
18851885
},
1886-
"nanoFramework.Tools.BuildTasks": {
1887-
"type": "Project",
1888-
"dependencies": {
1889-
"Microsoft.Build.Framework": "[17.12.6, )",
1890-
"Microsoft.Build.Utilities.Core": "[17.11.4, )"
1891-
}
18921886
}
18931887
},
18941888
".NETFramework,Version=v4.7.2/win": {

0 commit comments

Comments
 (0)