Skip to content

Commit fb1dbe0

Browse files
Update package references (#754)
* Update package references Update a number of packages to be more modern Stop shipping binaries to run in VisualStudio that VisualStudio already ships (With binding redirects/etc.) Update the SLN file so that the Vsix project is the default startup project. * Accept code review feedback
1 parent 3d48df1 commit fb1dbe0

File tree

5 files changed

+13
-22
lines changed

5 files changed

+13
-22
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131

3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild" PrivateAssets="All" />
34-
<PackageReference Include="NerdBank.GitVersioning" PrivateAssets="All" />
34+
<PackageReference Include="NerdBank.GitVersioning" PrivateAssets="All" Condition="!Exists('packages.config')" />
3535
</ItemGroup>
3636
</Project>

Directory.Packages.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
<ItemGroup>
1111
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
12-
<PackageVersion Include="Microsoft.Build.Framework" Version="16.9.0" />
13-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
14-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
12+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
13+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.8.3" />
14+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
1515
<PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" />
1616
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.7.188" />
17-
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild" Version="2.0.65" />
17+
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild" Version="2.0.66" />
1818
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="17.7.188" />
1919
<PackageVersion Include="Microsoft.VisualStudio.Settings.15.0" Version="17.5.33428.388" />
2020
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.7.37355" />
@@ -28,10 +28,10 @@
2828
<PackageVersion Include="Microsoft.WebTools.Languages.Json" Version="$(WebToolsPackageVersion)" />
2929
<PackageVersion Include="Microsoft.WebTools.Languages.Json.Editor" Version="$(WebToolsPackageVersion)" />
3030
<PackageVersion Include="Microsoft.WebTools.Languages.Json.VS" Version="$(WebToolsPackageVersion)" />
31-
<PackageVersion Include="Moq" Version="4.10.1" />
32-
<PackageVersion Include="NerdBank.GitVersioning" Version="3.3.37" />
31+
<PackageVersion Include="Moq" Version="4.20.70" />
32+
<PackageVersion Include="NerdBank.GitVersioning" Version="3.6.133" />
3333
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
34-
<PackageVersion Include="Nuget.VisualStudio" Version="6.0.0" />
34+
<PackageVersion Include="Nuget.VisualStudio" Version="17.7.1" />
3535

3636
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
3737
<PackageVersion Include="System.Memory" Version="4.5.5" />
@@ -45,7 +45,7 @@
4545

4646
<!-- Test references -->
4747
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
48-
<PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="17.7.34031.279" />
48+
<PackageVersion Include="Microsoft.Test.Apex.VisualStudio" Version="17.10.34923.60" />
4949
<PackageVersion Include="MSTest.TestAdapter" Version="3.0.3" />
5050
<PackageVersion Include="MSTest.TestFramework" Version="3.0.3" />
5151

LibraryManager.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E67307E3
3030
build\PackageVersions.targets = build\PackageVersions.targets
3131
EndProjectSection
3232
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}"
34+
EndProject
3335
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager", "src\LibraryManager\Microsoft.Web.LibraryManager.csproj", "{707356DD-96B9-49F6-AF2A-9D23B857A1E2}"
3436
ProjectSection(ProjectDependencies) = postProject
3537
{FF466454-426B-4AD7-8B00-D50011BE716F} = {FF466454-426B-4AD7-8B00-D50011BE716F}
3638
EndProjectSection
3739
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix", "src\LibraryManager.Vsix\Microsoft.Web.LibraryManager.Vsix.csproj", "{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}"
39-
EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Test", "test\LibraryManager.Test\Microsoft.Web.LibraryManager.Test.csproj", "{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}"
4141
EndProject
4242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Contracts", "src\LibraryManager.Contracts\Microsoft.Web.LibraryManager.Contracts.csproj", "{FF466454-426B-4AD7-8B00-D50011BE716F}"

src/LibraryManager.Vsix/Microsoft.Web.LibraryManager.Vsix.csproj

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -382,14 +382,6 @@
382382
<ItemGroup>
383383
<None Include="Commands\CommandTable\LocalizationFiles\VSCommandTable.*.xlf" />
384384
</ItemGroup>
385-
<ItemGroup>
386-
<ThirdPartyAssemblies Include="$(OutputPath)\MessagePack.dll" />
387-
<ThirdPartyAssemblies Include="$(OutputPath)\MessagePack.Annotations.dll" />
388-
<ThirdPartyAssemblies Include="$(OutputPath)\Nerdbank.Streams.dll" />
389-
<FilesToSign Include="@(ThirdPartyAssemblies)">
390-
<Authenticode>3PartySHA2</Authenticode>
391-
</FilesToSign>
392-
</ItemGroup>
393385
<Target Name="PreCreateVsixContainer" BeforeTargets="CreateVsixContainer">
394386
<ItemGroup>
395387
<VSIXSourceItem Include="$(OutputPath)%(DstLocales.Identity)\Microsoft.Web.LibraryManager.resources.dll" Condition="Exists('$(OutputPath)\%(DstLocales.Identity)\Microsoft.Web.LibraryManager.resources.dll')">
@@ -411,7 +403,7 @@
411403
</ItemGroup>
412404
<ItemGroup>
413405
<ReferencePath Condition="&#xD;&#xA; '%(FileName)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime'&#xD;&#xA; or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.12.0'&#xD;&#xA; or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime'&#xD;&#xA; or '%(FileName)' == 'Nuget.VisualStudio'&#xD;&#xA; ">
414-
<EmbedInteropTypes>true</EmbedInteropTypes>
406+
<EmbedInteropTypes>false</EmbedInteropTypes>
415407
</ReferencePath>
416408
</ItemGroup>
417409
</Target>
@@ -423,7 +415,6 @@
423415
</_VsixSourceItemsFromNuGet>
424416
<!-- Replace the existing VSIX source items as they are picked up before any signing can occur on them -->
425417
<VSIXSourceItem Remove="@(_VsixSourceItemsFromNuGet)" />
426-
<VSIXSourceItem Include="$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)" Condition="Exists('$(OutputPath)\%(_VsixSourceItemsFromNuGet.FileName)%(_VsixSourceItemsFromNuGet.Extension)')" />
427418
</ItemGroup>
428419
</Target>
429420
</Project>

test/LibraryManager.Mocks/Microsoft.Web.LibraryManager.Mocks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;$(NetFxTFM)</TargetFrameworks>
3+
<TargetFrameworks>$(NetCoreTFM);$(NetFxTFM)</TargetFrameworks>
44
<PackageTags>mocks, unit test, library, client-side, package</PackageTags>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)