Skip to content

Commit 21cf3af

Browse files
MrLujeMrLuje
authored
Merge pull request #11 from MrLuje/feature/vs2022
2 parents 7cfec8e + ab8a6d4 commit 21cf3af

File tree

11 files changed

+85
-1164
lines changed

11 files changed

+85
-1164
lines changed

‎.paket/Paket.Restore.targets‎

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

‎.paket/paket.exe‎

-62.8 KB
Binary file not shown.

‎.paket/paket.targets‎

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

‎Mocking.Helpers/Mocking.Helpers.Vsix/Mocking.Helpers.Vsix.csproj‎

Lines changed: 20 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.props')" Label="Paket" />
4+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.props')" />
5+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.props')" />
56
<PropertyGroup>
67
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
78
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
89
<FileUpgradeFlags>
910
</FileUpgradeFlags>
1011
<OldToolsVersion>14.0</OldToolsVersion>
1112
<UpgradeBackupLocation />
13+
<NuGetPackageImportStamp>
14+
</NuGetPackageImportStamp>
1215
</PropertyGroup>
1316
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1417
<PropertyGroup>
@@ -39,6 +42,8 @@
3942
<DefineConstants>DEBUG;TRACE</DefineConstants>
4043
<ErrorReport>prompt</ErrorReport>
4144
<WarningLevel>4</WarningLevel>
45+
<CreateVsixContainer>True</CreateVsixContainer>
46+
<DeployExtension>True</DeployExtension>
4247
</PropertyGroup>
4348
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
4449
<DebugType>pdbonly</DebugType>
@@ -54,7 +59,7 @@
5459
<StartArguments>/rootsuffix Roslyn</StartArguments>
5560
</PropertyGroup>
5661
<ItemGroup>
57-
<None Include="paket.references" />
62+
<None Include="packages.config" />
5863
<None Include="source.extension.vsixmanifest">
5964
<SubType>Designer</SubType>
6065
</None>
@@ -79,61 +84,19 @@
7984
<Name>Mocking.Helpers</Name>
8085
</ProjectReference>
8186
</ItemGroup>
82-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
83-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
84-
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Label="Paket" />
85-
<ItemGroup>
86-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll">
87-
<Paket>True</Paket>
88-
</Analyzer>
89-
</ItemGroup>
90-
<Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Label="Paket" />
9187
<ItemGroup>
92-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll">
93-
<Paket>True</Paket>
94-
</Analyzer>
95-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll">
96-
<Paket>True</Paket>
97-
</Analyzer>
98-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\cs\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
99-
<Paket>True</Paket>
100-
</Analyzer>
101-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\de\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
102-
<Paket>True</Paket>
103-
</Analyzer>
104-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\es\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
105-
<Paket>True</Paket>
106-
</Analyzer>
107-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\fr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
108-
<Paket>True</Paket>
109-
</Analyzer>
110-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\it\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
111-
<Paket>True</Paket>
112-
</Analyzer>
113-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ja\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
114-
<Paket>True</Paket>
115-
</Analyzer>
116-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ko\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
117-
<Paket>True</Paket>
118-
</Analyzer>
119-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pl\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
120-
<Paket>True</Paket>
121-
</Analyzer>
122-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\pt-BR\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
123-
<Paket>True</Paket>
124-
</Analyzer>
125-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\ru\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
126-
<Paket>True</Paket>
127-
</Analyzer>
128-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\tr\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
129-
<Paket>True</Paket>
130-
</Analyzer>
131-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hans\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
132-
<Paket>True</Paket>
133-
</Analyzer>
134-
<Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers\analyzers\cs\zh-Hant\Microsoft.VisualStudio.Threading.Analyzers.resources.dll">
135-
<Paket>True</Paket>
136-
</Analyzer>
88+
<Reference Include="Microsoft.CodeAnalysis.CSharp.Features, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Features.4.1.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Features.dll</HintPath>
90+
</Reference>
13791
</ItemGroup>
138-
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools\build\Microsoft.VSSDK.BuildTools.targets')" Label="Paket" />
92+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
93+
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
94+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
95+
<PropertyGroup>
96+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
97+
</PropertyGroup>
98+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.props'))" />
99+
<Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.targets'))" />
100+
</Target>
101+
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.17.1.4054\build\Microsoft.VSSDK.BuildTools.targets')" />
139102
</Project>

‎Mocking.Helpers/Mocking.Helpers.Vsix/packages.config‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Humanizer.Core" version="2.2.0" targetFramework="net472" />
4+
<package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net472" />
5+
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.3.3" targetFramework="net472" developmentDependency="true" />
6+
<package id="Microsoft.CodeAnalysis.AnalyzerUtilities" version="3.3.0" targetFramework="net472" />
7+
<package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="3.3.2" targetFramework="net472" developmentDependency="true" />
8+
<package id="Microsoft.CodeAnalysis.Common" version="4.1.0" targetFramework="net472" />
9+
<package id="Microsoft.CodeAnalysis.CSharp" version="4.1.0" targetFramework="net472" />
10+
<package id="Microsoft.CodeAnalysis.CSharp.Features" version="4.1.0" targetFramework="net461" />
11+
<package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="4.1.0" targetFramework="net472" />
12+
<package id="Microsoft.CodeAnalysis.Features" version="4.1.0" targetFramework="net472" />
13+
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="4.1.0" targetFramework="net472" />
14+
<package id="Microsoft.CodeAnalysis.Workspaces.Common" version="4.1.0" targetFramework="net472" />
15+
<package id="Microsoft.DiaSymReader" version="1.4.0" targetFramework="net472" />
16+
<package id="Microsoft.VisualStudio.SDK.Analyzers" version="16.10.10" targetFramework="net472" developmentDependency="true" />
17+
<package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.10.56" targetFramework="net472" developmentDependency="true" />
18+
<package id="Microsoft.VSSDK.BuildTools" version="17.1.4054" targetFramework="net461" developmentDependency="true" />
19+
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
20+
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net472" />
21+
<package id="System.Composition" version="1.0.31" targetFramework="net472" />
22+
<package id="System.Composition.AttributedModel" version="1.0.31" targetFramework="net472" />
23+
<package id="System.Composition.Convention" version="1.0.31" targetFramework="net472" />
24+
<package id="System.Composition.Hosting" version="1.0.31" targetFramework="net472" />
25+
<package id="System.Composition.Runtime" version="1.0.31" targetFramework="net472" />
26+
<package id="System.Composition.TypedParts" version="1.0.31" targetFramework="net472" />
27+
<package id="System.IO.Pipelines" version="5.0.1" targetFramework="net472" />
28+
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
29+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
30+
<package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net472" />
31+
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
32+
<package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
33+
<package id="System.Text.Encodings.Web" version="4.7.0" targetFramework="net472" />
34+
<package id="System.Text.Json" version="4.7.0" targetFramework="net472" />
35+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
36+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
37+
</packages>

‎Mocking.Helpers/Mocking.Helpers.Vsix/paket.references‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Mocking.Helpers/Mocking.Helpers.Vsix/source.extension.vsixmanifest‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,42 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
1+
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
32
<Metadata>
4-
<Identity Id="Mocking.Helpers.DC82BF19-0482-4D47-A1FF-7F4CBBAA44D4" Version="1.0.0.0" Language="en-US" Publisher="MrLuje"/>
3+
<Identity Id="Mocking.Helpers.DC82BF19-0482-4D47-A1FF-7F4CBBAA44D4" Version="1.0.0.0" Language="en-US" Publisher="MrLuje" />
54
<DisplayName>Mocking.Helpers</DisplayName>
65
<Description xml:space="preserve">Collection of features to help working with various mocking framework</Description>
76
<MoreInfo>https://github.com/MrLuje/Mocking.Helpers</MoreInfo>
87
<Icon>Resources\mocking-helpers.png</Icon>
98
<PreviewImage>Resources\moq.png</PreviewImage>
109
<Tags>mocking roslyn moq nsubstitute</Tags>
10+
<Preview>true</Preview>
1111
</Metadata>
1212
<Installation>
13-
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)" />
14-
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
15-
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
13+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,17.0)">
14+
<ProductArchitecture>x86</ProductArchitecture>
15+
</InstallationTarget>
16+
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
17+
<ProductArchitecture>amd64</ProductArchitecture>
18+
</InstallationTarget>
19+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[15.0,17.0)">
20+
<ProductArchitecture>x86</ProductArchitecture>
21+
</InstallationTarget>
22+
<InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
23+
<ProductArchitecture>amd64</ProductArchitecture>
24+
</InstallationTarget>
25+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[15.0,17.0)">
26+
<ProductArchitecture>x86</ProductArchitecture>
27+
</InstallationTarget>
28+
<InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
29+
<ProductArchitecture>amd64</ProductArchitecture>
30+
</InstallationTarget>
1631
</Installation>
1732
<Dependencies>
18-
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
33+
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="[4.5,)" />
1934
</Dependencies>
2035
<Assets>
21-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="Mocking.Helpers" Path="|Mocking.Helpers|"/>
36+
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Mocking.Helpers.dll" />
2237
</Assets>
2338
<Prerequisites>
24-
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
25-
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,17.0)" DisplayName="Roslyn Language Services" />
39+
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,18.0)" DisplayName="Visual Studio core editor" />
40+
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,18.0)" DisplayName="Roslyn Language Services" />
2641
</Prerequisites>
2742
</PackageManifest>

‎Mocking.Helpers/Mocking.Helpers/Mocking.Helpers.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.1.0" />
8+
</ItemGroup>
69
<ItemGroup>
710
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />
811
</ItemGroup>
9-
<Import Project="..\..\.paket\Paket.Restore.targets" />
1012
</Project>

‎Mocking.Helpers/Mocking.Helpers/paket.references‎

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

‎paket.dependencies‎

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

0 commit comments

Comments
 (0)