|
8 | 8 | <ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
|
9 | 9 | <OutputPath>bin\$(Configuration)\</OutputPath>
|
10 | 10 | <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
11 |
| - <!-- Other projects should not reference this assembly. It is only mean to be used in Visual Studio. --> |
| 11 | + <!-- Other projects should not reference this assembly. It is only meaning to be used in Visual Studio. --> |
12 | 12 | <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
|
| 13 | + <IsShippingPackage>false</IsShippingPackage> |
| 14 | + <IsPackable>false</IsPackable> |
| 15 | + <EnableSourceLink>false</EnableSourceLink> |
| 16 | + <GenerateSourceLinkFile>false</GenerateSourceLinkFile> |
13 | 17 | </PropertyGroup>
|
14 | 18 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
| 19 | + |
15 | 20 | <!--
|
16 | 21 | Since the VSSDK doeesn't support SDK-based projects, we have to use the long/verbose version.
|
17 | 22 |
|
|
20 | 25 |
|
21 | 26 | BEGIN INTERESTING STUFF
|
22 | 27 | -->
|
23 |
| - <PropertyGroup> |
24 |
| - <!-- VSIXes are always signed. This is the same key that ASP.NET uses for OSS signing --> |
25 |
| - <SignAssembly>true</SignAssembly> |
26 |
| - <AssemblyOriginatorKeyFile>..\..\..\eng\AspNetCore.snk</AssemblyOriginatorKeyFile> |
27 |
| - </PropertyGroup> |
28 | 28 | <PropertyGroup>
|
29 | 29 | <!--
|
30 | 30 | Following VS convention of using the VS release # as a convention for the vsix version.
|
31 | 31 |
|
32 |
| - VS needs this build number to be parsable by System.Version, so it can't have any letters. |
| 32 | + VS needs this build number to be parsable by System.Version, so it can't have any letters or a - which |
| 33 | + is used by our build system. |
33 | 34 | -->
|
34 |
| - <VsixVersion>15.7</VsixVersion> |
35 |
| - <VsixVersion Condition="'$(BuildNumber)'!='' AND '$(BuildNumber)'!='t000'">$(VsixVersion).$(BuildNumber)</VsixVersion> |
36 |
| - <VsixVersion Condition="'$(BuildNumber)'=='' AND '$(CI)'!='true'">$(VsixVersion).999999</VsixVersion> |
37 |
| - <VsixVersion Condition="'$(BuildNumber)'=='' AND '$(CI)'=='true'">$(VsixVersion).ERROR-MISSING_BUILD_NUMBER</VsixVersion> |
| 35 | + <VsixVersionPrefix>16.0</VsixVersionPrefix> |
| 36 | + <VsixVersionSuffix Condition="'$(BuildNumberSuffix)'=='t000'">424242.424242</VsixVersionSuffix> |
| 37 | + <VsixVersionSuffix Condition="'$(VsixVersionSuffix)'==''">$(BuildNumberSuffix.Replace('-', '.'))</VsixVersionSuffix> |
| 38 | + <VsixVersion>$(VsixVersionPrefix).$(VsixVersionSuffix)</VsixVersion> |
38 | 39 | </PropertyGroup>
|
39 | 40 | <!--
|
40 | 41 | Used by the .vsixmanifest to insert the the VSIX version based on $(VsixVersion)
|
41 | 42 | -->
|
42 | 43 | <Target Name="GetBuildVersion" Outputs="$(VsixVersion)" />
|
| 44 | + |
43 | 45 | <PropertyGroup>
|
44 | 46 | <!-- Use the same experimental hive as Roslyn and Razor. This makes it easy to mix private builds. -->
|
45 | 47 | <StartAction>Program</StartAction>
|
|
71 | 73 | <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
|
72 | 74 | <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
|
73 | 75 | </PropertyGroup>
|
74 |
| - <Target Name="PreCreateVsixContainer" BeforeTargets="CreateVsixContainer"> |
| 76 | + <Target Name="PreCreateVsixContainer" BeforeTargets="GetVsixSourceItems"> |
75 | 77 | <ItemGroup>
|
76 | 78 | <VSIXSourceItem Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.Blazor.Templates.*.nupkg">
|
77 | 79 | <VSIXSubPath>ProjectTemplates\</VSIXSubPath>
|
|
89 | 91 | <Target Name="CopySymbolsToOutput" AfterTargets="Build" Condition="'$(SymbolsPublishDir)' != ''">
|
90 | 92 | <Copy SourceFiles="$(OutDir)$(AssemblyName).pdb" DestinationFolder="$(SymbolsPublishDir)" />
|
91 | 93 | </Target>
|
92 |
| - <!-- |
93 |
| - We should be really careful about what goes into the VSIX and what doesn't. Since we're using |
94 |
| - P2P references and packages, there are some things we need to exclude. |
95 | 94 |
|
96 |
| - We want everything that *we* don't own to be excluded, those dependencies need to be satisfied |
97 |
| - by other VS components (Razor, Roslyn). |
98 |
| -
|
99 |
| - Ideally we could use an allow-list here, but I don't know how to do that. |
100 |
| - --> |
101 |
| - <ItemDefinitionGroup> |
102 |
| - <SuppressFromVsix> |
103 |
| - <Visible>false</Visible> |
104 |
| - </SuppressFromVsix> |
105 |
| - </ItemDefinitionGroup> |
106 |
| - <ItemGroup> |
107 |
| - <SuppressFromVsix Include="Microsoft.AspNetCore.Razor.Language.dll" /> |
108 |
| - <SuppressFromVsix Include="Microsoft.CodeAnalysis.Razor.dll" /> |
109 |
| - <SuppressFromVsix Include="Microsoft.CodeAnalysis.Razor.Workspaces.dll" /> |
110 |
| - </ItemGroup> |
111 | 95 | <ItemGroup>
|
112 | 96 | <!--
|
113 | 97 | Let's continue our parade of gross workarounds.
|
|
124 | 108 | <ProjectReference Include="..\..\Templates\src\Microsoft.AspNetCore.Blazor.Templates.csproj">
|
125 | 109 | <Project>{edd21533-c6e6-4f85-be4f-10e06756e24c}</Project>
|
126 | 110 | <Name>Microsoft.AspNetCore.Blazor.Templates</Name>
|
| 111 | + <Targets>Pack</Targets> |
127 | 112 | <Private>False</Private>
|
128 | 113 | <IncludeOutputGroupsInVSIX>
|
129 | 114 | </IncludeOutputGroupsInVSIX>
|
130 | 115 | <IncludeOutputGroupsInVSIXLocalOnly>
|
131 | 116 | </IncludeOutputGroupsInVSIXLocalOnly>
|
132 | 117 | </ProjectReference>
|
133 |
| - <ProjectReference Include="..\..\BlazorLanguageServices\src\Microsoft.VisualStudio.LanguageServices.Blazor.csproj"> |
134 |
| - <Project>{b9f7f502-6dd2-4e77-8fd1-cbd76f695b26}</Project> |
135 |
| - <Name>Microsoft.VisualStudio.LanguageServices.Blazor</Name> |
136 |
| - <Private>False</Private> |
137 |
| - <IncludeOutputGroupsInVSIX> |
138 |
| - </IncludeOutputGroupsInVSIX> |
139 |
| - <IncludeOutputGroupsInVSIXLocalOnly> |
140 |
| - </IncludeOutputGroupsInVSIXLocalOnly> |
141 |
| - </ProjectReference> |
142 |
| - <Content Include="..\..\BlazorLanguageServices\src\bin\$(Configuration)\net461\Microsoft.VisualStudio.LanguageServices.Blazor.dll"> |
143 |
| - <Link>Microsoft.VisualStudio.LanguageServices.Blazor.dll</Link> |
144 |
| - <IncludeInVSIX>true</IncludeInVSIX> |
145 |
| - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
146 |
| - <Visible>false</Visible> |
147 |
| - </Content> |
148 | 118 | </ItemGroup>
|
149 | 119 | <!--
|
150 | 120 | We need to generate the assembly attributes for our assembly using the version from the build, so
|
|
189 | 159 | <AppDesignerFolder>Properties</AppDesignerFolder>
|
190 | 160 | <RootNamespace>Microsoft.VisualStudio.BlazorExtension</RootNamespace>
|
191 | 161 | <AssemblyName>Microsoft.VisualStudio.BlazorExtension</AssemblyName>
|
192 |
| - <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> |
| 162 | + <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> |
193 | 163 | <GeneratePkgDefFile>true</GeneratePkgDefFile>
|
194 | 164 | </PropertyGroup>
|
195 | 165 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
|
208 | 178 | <WarningLevel>4</WarningLevel>
|
209 | 179 | </PropertyGroup>
|
210 | 180 | <ItemGroup>
|
211 |
| - <PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.6.27413" /> |
212 |
| - <PackageReference Include="Microsoft.VisualStudio.Imaging" Version="15.6.27413" /> |
213 |
| - <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" /> |
214 |
| - <PackageReference Include="Microsoft.VisualStudio.ProjectSystem" Version="15.3.224" /> |
215 |
| - <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.16" /> |
216 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.6.27413" /> |
217 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="15.6.27413" /> |
218 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="7.10.6072" /> |
219 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="10.0.30320" /> |
220 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61031" /> |
221 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" /> |
222 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="8.0.50728" /> |
223 |
| - <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="9.0.30730" /> |
224 |
| - <PackageReference Include="Microsoft.VisualStudio.TextManager.Interop" Version="7.10.6071" /> |
225 |
| - <PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.8.0" Version="8.0.50728" /> |
226 |
| - <PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.6.46" /> |
227 |
| - <PackageReference Include="Microsoft.VisualStudio.Utilities" Version="15.6.27413" /> |
228 |
| - <PackageReference Include="Microsoft.VisualStudio.Validation" Version="15.3.15" /> |
229 |
| - <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.5.100" /> |
| 181 | + <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.7.27703" /> |
| 182 | + <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.9.3032" /> |
| 183 | + <PackageReference Include="StreamJsonRpc" Version="1.5.43" /> |
230 | 184 | </ItemGroup>
|
231 | 185 | <ItemGroup>
|
232 | 186 | <Compile Include="AboutDialogInfoAttribute.cs" />
|
233 | 187 | <Compile Include="AutoRebuild\AutoRebuildService.cs" />
|
234 | 188 | <Compile Include="AutoRebuild\BuildEventsWatcher.cs" />
|
235 | 189 | <Compile Include="AutoRebuild\StreamProtocolExtensions.cs" />
|
236 | 190 | <Compile Include="BlazorPackage.cs" />
|
237 |
| - <Compile Include="Properties\AssemblyInfo.cs" /> |
238 | 191 | </ItemGroup>
|
239 | 192 | <ItemGroup>
|
240 | 193 | <Content Include="CodeSnippets\Blazor\para.snippet">
|
|
306 | 259 | <_GeneratedVSIXAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).VSIXAssemblyInfo.cache.txt</_GeneratedVSIXAssemblyInfoInputsCacheFile>
|
307 | 260 | <_GeneratedVSIXAssemblyInfoFile>$(IntermediateOutputPath)$(MSBuildProjectName).VSIXAssemblyInfo.cs</_GeneratedVSIXAssemblyInfoFile>
|
308 | 261 | </PropertyGroup>
|
| 262 | + |
| 263 | + <!-- This needs to be here because the build will try to call it --> |
| 264 | + <Target Name="Pack"> |
| 265 | + </Target> |
309 | 266 | </Project>
|
0 commit comments