Skip to content

Commit a55e8da

Browse files
jmarolfjmarolf
committed
fixing samples build
1 parent 6e12b74 commit a55e8da

File tree

25 files changed

+232
-1146
lines changed

25 files changed

+232
-1146
lines changed

‎Samples.sln

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analyzers.Vsix", "samples\C
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvertToAutoProperty", "samples\CSharp\ConvertToAutoProperty\ConvertToAutoProperty.Implementation\ConvertToAutoProperty.csproj", "{827CDC89-B2BE-41E1-ABC2-792BA5B3A507}"
3333
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertToAutoProperty.Vsix", "samples\CSharp\ConvertToAutoProperty\ConvertToAutoProperty.Vsix\ConvertToAutoProperty.Vsix.csproj", "{9DBD9E20-1C7D-4105-85CF-1F21660E1DE9}"
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertToAutoProperty.CSharp.Vsix", "samples\CSharp\ConvertToAutoProperty\ConvertToAutoProperty.Vsix\ConvertToAutoProperty.CSharp.Vsix.csproj", "{9DBD9E20-1C7D-4105-85CF-1F21660E1DE9}"
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvertToConditional", "samples\CSharp\ConvertToConditional\ConvertToConditional.Implementation\ConvertToConditional.csproj", "{1305FEEC-7DED-46A9-89C2-2544E8BECEA3}"
3737
EndProject
3838
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvertToConditional.Test", "samples\CSharp\ConvertToConditional\ConvertToConditional.Test\ConvertToConditional.Test.csproj", "{2B6860EC-C15D-4E56-A5A2-6399F502B4FA}"
3939
EndProject
40-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertToConditional.Vsix", "samples\CSharp\ConvertToConditional\ConvertToConditional.Vsix\ConvertToConditional.Vsix.csproj", "{D49B7CE5-5292-4EEA-AE1E-5B55C5E059D5}"
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertToConditional.CSharp.Vsix", "samples\CSharp\ConvertToConditional\ConvertToConditional.Vsix\ConvertToConditional.CSharp.Vsix.csproj", "{D49B7CE5-5292-4EEA-AE1E-5B55C5E059D5}"
4141
EndProject
4242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MakeConst", "samples\CSharp\MakeConst\MakeConst.Implementation\MakeConst.csproj", "{80612064-35D2-4FFD-ABCC-2953A84A825F}"
4343
EndProject
44-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeConst.Vsix", "samples\CSharp\MakeConst\MakeConst.Vsix\MakeConst.Vsix.csproj", "{683D55F6-A035-48A5-B989-9B549DB7F53D}"
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeConst.CSharp.Vsix", "samples\CSharp\MakeConst\MakeConst.Vsix\MakeConst.CSharp.Vsix.csproj", "{683D55F6-A035-48A5-B989-9B549DB7F53D}"
4545
EndProject
4646
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RefOutModifier", "samples\CSharp\RefOutModifier\RefOutModifier.Implementation\RefOutModifier.csproj", "{E2040FD9-5CF1-4500-9D55-D8994F1EF328}"
4747
EndProject
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefOutModifier.Vsix", "samples\CSharp\RefOutModifier\RefOutModifier.Vsix\RefOutModifier.Vsix.csproj", "{DE024511-D4E4-4C3D-89DC-37C3A8AA8198}"
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RefOutModifier.CSharp.Vsix", "samples\CSharp\RefOutModifier\RefOutModifier.Vsix\RefOutModifier.CSharp.Vsix.csproj", "{DE024511-D4E4-4C3D-89DC-37C3A8AA8198}"
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APISamples", "samples\CSharp\APISamples\APISamples.csproj", "{2A953FCA-A243-4013-85E5-1CF6B1677BB2}"
5151
EndProject
@@ -75,37 +75,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConvertToAutoProperty", "Co
7575
EndProject
7676
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ConvertToAutoProperty", "samples\VisualBasic\ConvertToAutoProperty\ConvertToAutoProperty\ConvertToAutoProperty.vbproj", "{C7811972-6954-4E90-83AC-6365DDA519B4}"
7777
EndProject
78-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ConvertToAutoProperty.Vsix", "samples\VisualBasic\ConvertToAutoProperty\ConvertToAutoProperty.Vsix\ConvertToAutoProperty.Vsix.vbproj", "{B090C3E7-7DA0-4CDB-AC9E-903BDCB20DB8}"
78+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ConvertToAutoProperty.VisualBasic.Vsix", "samples\VisualBasic\ConvertToAutoProperty\ConvertToAutoProperty.Vsix\ConvertToAutoProperty.VisualBasic.Vsix.vbproj", "{B090C3E7-7DA0-4CDB-AC9E-903BDCB20DB8}"
7979
EndProject
8080
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "FormatSolution", "samples\VisualBasic\FormatSolution\FormatSolution.vbproj", "{AE4D8D13-B58C-4B0F-B326-13D002505E58}"
8181
EndProject
8282
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImplementNotifyPropertyChanged", "ImplementNotifyPropertyChanged", "{01759F21-28C9-4934-A4DC-B9948C9DB803}"
8383
EndProject
8484
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ImplementNotifyPropertyChanged", "samples\VisualBasic\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.vbproj", "{22D1F704-48D2-495B-8ECD-43DA4F615211}"
8585
EndProject
86-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImplementNotifyPropertyChanged.Vsix", "samples\VisualBasic\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.Vsix\ImplementNotifyPropertyChanged.Vsix.vbproj", "{4C700A07-C81B-44D5-8C9F-BD874775C57B}"
86+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImplementNotifyPropertyChanged.VisualBasic.Vsix", "samples\VisualBasic\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.Vsix\ImplementNotifyPropertyChanged.VisualBasic.Vsix.vbproj", "{4C700A07-C81B-44D5-8C9F-BD874775C57B}"
8787
EndProject
8888
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImplementNotifyPropertyChanged", "ImplementNotifyPropertyChanged", "{01998C95-7806-4BED-811D-70D4F8B1E112}"
8989
EndProject
9090
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplementNotifyPropertyChanged", "samples\CSharp\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.csproj", "{7F30B89A-FFC5-4645-8273-FF12BCC2BD04}"
9191
EndProject
92-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplementNotifyPropertyChanged.Vsix", "samples\CSharp\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.Vsix\ImplementNotifyPropertyChanged.Vsix.csproj", "{1396AC51-E385-4894-A354-9D566189DDEB}"
92+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplementNotifyPropertyChanged.CSharp.Vsix", "samples\CSharp\ImplementNotifyPropertyChanged\ImplementNotifyPropertyChanged.Vsix\ImplementNotifyPropertyChanged.CSharp.Vsix.csproj", "{1396AC51-E385-4894-A354-9D566189DDEB}"
9393
EndProject
9494
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "TreeTransforms", "samples\VisualBasic\TreeTransforms\TreeTransforms.vbproj", "{996E8EDA-D925-45BB-B64A-079381A2BC7A}"
9595
EndProject
9696
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RemoveByVal", "RemoveByVal", "{64885FF2-EE63-4433-A890-7903B9E8AFBC}"
9797
EndProject
9898
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "RemoveByVal", "samples\VisualBasic\RemoveByVal\RemoveByVal\RemoveByVal.vbproj", "{54FEC454-DC25-4700-B315-E576F1860C41}"
9999
EndProject
100-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RemoveByVal.Vsix", "samples\VisualBasic\RemoveByVal\RemoveByVal.Vsix\RemoveByVal.Vsix.vbproj", "{BD5C5824-470E-4451-BC21-5E50892905E9}"
100+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RemoveByVal.VisualBasic.Vsix", "samples\VisualBasic\RemoveByVal\RemoveByVal.Vsix\RemoveByVal.VisualBasic.Vsix.vbproj", "{BD5C5824-470E-4451-BC21-5E50892905E9}"
101101
EndProject
102102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MakeConst", "MakeConst", "{8E328BEA-C8D7-4F4B-A357-4A84CAF76EDE}"
103103
EndProject
104104
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "MakeConst", "samples\VisualBasic\MakeConst\MakeConst\MakeConst.vbproj", "{AB0EC03A-DC42-448D-BECA-C764DC6461EE}"
105105
EndProject
106106
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "MakeConst.Test", "samples\VisualBasic\MakeConst\MakeConst.Test\MakeConst.Test.vbproj", "{20E6E463-CC7E-4A74-98BF-DF956D651360}"
107107
EndProject
108-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MakeConst.Vsix", "samples\VisualBasic\MakeConst\MakeConst.Vsix\MakeConst.Vsix.vbproj", "{9C74F8EA-E6C7-448C-BC04-29F4CE9DC994}"
108+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MakeConst.VisualBasic.Vsix", "samples\VisualBasic\MakeConst\MakeConst.Vsix\MakeConst.VisualBasic.Vsix.vbproj", "{9C74F8EA-E6C7-448C-BC04-29F4CE9DC994}"
109109
EndProject
110110
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasicToCSharpConverter", "VisualBasicToCSharpConverter", "{8E1C9AEC-6EF1-43A8-A378-52C5C0E40532}"
111111
EndProject

‎build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore -build -projects %~dp0Roslyn-SDK.sln %*"
2+
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
33
exit /b %ErrorLevel%

‎restore.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore -projects %~dp0Roslyn-SDK.sln %*"
2+
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
33
exit /b %ErrorLevel%

‎samples/CSharp/Analyzers/Analyzers.Vsix/Analyzers.Vsix.csproj

+10-87
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
6-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
7-
<FileUpgradeFlags>
8-
</FileUpgradeFlags>
9-
<OldToolsVersion>14.0</OldToolsVersion>
10-
<UpgradeBackupLocation />
11-
<PublishUrl>publish\</PublishUrl>
12-
<Install>true</Install>
13-
<InstallFrom>Disk</InstallFrom>
14-
<UpdateEnabled>false</UpdateEnabled>
15-
<UpdateMode>Foreground</UpdateMode>
16-
<UpdateInterval>7</UpdateInterval>
17-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
18-
<UpdatePeriodically>false</UpdatePeriodically>
19-
<UpdateRequired>false</UpdateRequired>
20-
<MapFileExtensions>true</MapFileExtensions>
21-
<ApplicationRevision>0</ApplicationRevision>
22-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
23-
<IsWebBootstrapper>false</IsWebBootstrapper>
24-
<UseApplicationTrust>false</UseApplicationTrust>
25-
<BootstrapperEnabled>true</BootstrapperEnabled>
26-
<OutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\bin\Sample.Analyzers.Vsix'))</OutputPath>
27-
</PropertyGroup>
28-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
29-
<PropertyGroup>
30-
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
31-
<Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
32-
<PlatformTarget>AnyCPU</PlatformTarget>
33-
<SchemaVersion>2.0</SchemaVersion>
34-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
35-
<ProjectGuid>{D3C8EE30-8885-43F4-9C76-0D66A13FC4EA}</ProjectGuid>
36-
<OutputType>Library</OutputType>
37-
<AppDesignerFolder>Properties</AppDesignerFolder>
38-
<RootNamespace>Analyzers.Vsix</RootNamespace>
39-
<AssemblyName>Analyzers</AssemblyName>
40-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
4+
<TargetFramework>net461</TargetFramework>
5+
<RootNamespace>Analyzers.CSharp.Vsix</RootNamespace>
6+
<AssemblyName>Analyzers.CSharp</AssemblyName>
7+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
8+
<IsProductComponent>false</IsProductComponent>
419
<GeneratePkgDefFile>false</GeneratePkgDefFile>
10+
<EnableDefaultItems>false</EnableDefaultItems>
4211
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
43-
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
44-
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
45-
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
46-
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
47-
<VSSDKTargetPlatformRegRootSuffix>Roslyn</VSSDKTargetPlatformRegRootSuffix>
48-
</PropertyGroup>
49-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
50-
<DebugSymbols>true</DebugSymbols>
51-
<DebugType>full</DebugType>
52-
<Optimize>false</Optimize>
53-
<OutputPath>bin\Debug\</OutputPath>
54-
<DefineConstants>DEBUG;TRACE</DefineConstants>
55-
<ErrorReport>prompt</ErrorReport>
56-
<WarningLevel>4</WarningLevel>
57-
</PropertyGroup>
58-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
59-
<DebugType>pdbonly</DebugType>
60-
<Optimize>true</Optimize>
61-
<OutputPath>bin\Release\</OutputPath>
62-
<DefineConstants>TRACE</DefineConstants>
63-
<ErrorReport>prompt</ErrorReport>
64-
<WarningLevel>4</WarningLevel>
6512
</PropertyGroup>
66-
<PropertyGroup>
67-
<StartAction>Program</StartAction>
68-
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
69-
<StartArguments>/rootsuffix Roslyn</StartArguments>
70-
</PropertyGroup>
71-
<ItemGroup>
72-
<None Include="source.extension.vsixmanifest">
73-
<SubType>Designer</SubType>
74-
</None>
75-
</ItemGroup>
7613
<ItemGroup>
77-
<BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
78-
<Visible>False</Visible>
79-
<ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
80-
<Install>true</Install>
81-
</BootstrapperPackage>
82-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
83-
<Visible>False</Visible>
84-
<ProductName>.NET Framework 3.5 SP1</ProductName>
85-
<Install>false</Install>
86-
</BootstrapperPackage>
14+
<None Include="source.extension.vsixmanifest" />
8715
</ItemGroup>
8816
<ItemGroup>
89-
<ProjectReference Include="..\Analyzers.Implementation\Analyzers.csproj">
90-
<Project>{2dde4d5e-9cb8-4e01-abaa-d39daa018a16}</Project>
91-
<Name>Analyzers</Name>
92-
</ProjectReference>
17+
<ProjectReference Include="..\Analyzers.Implementation\Analyzers.csproj" Name="Analyzers" />
9318
</ItemGroup>
94-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
95-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
9619
</Project>

‎samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/ConvertToAutoProperty.CSharp.Vsix.csproj

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
<RootNamespace>ConvertToAutoProperty.CSharp.Vsix</RootNamespace>
6+
<AssemblyName>ConvertToAutoProperty.CSharp</AssemblyName>
7+
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
8+
<IsProductComponent>false</IsProductComponent>
9+
<GeneratePkgDefFile>false</GeneratePkgDefFile>
10+
<EnableDefaultItems>false</EnableDefaultItems>
11+
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<None Include="source.extension.vsixmanifest">
16+
<SubType>Designer</SubType>
17+
</None>
18+
</ItemGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\ConvertToAutoProperty.Implementation\ConvertToAutoProperty.csproj" />
21+
</ItemGroup>
22+
</Project>

‎samples/CSharp/ConvertToAutoProperty/ConvertToAutoProperty.Vsix/ConvertToAutoProperty.Vsix.csproj

-95
This file was deleted.

0 commit comments

Comments
 (0)