Skip to content
This repository was archived by the owner on Jul 2, 2022. It is now read-only.

Commit 7848b6f

Browse files
kzukzu
committed
Modernize projects and build dependencies and packages
Aligns the project with what Clide does now, so that we can have a unified way to build.
1 parent e29b926 commit 7848b6f

10 files changed

+49
-156
lines changed

‎NuGet.Config

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<packageSources>
44
<clear />
55
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
6-
<add key="NuGetizer" value="https://ci.appveyor.com/nuget/nugetizer3000" />
7-
<add key="offline" value="%userprofile%\.nuget\packages" />
6+
<add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
7+
<add key="nugetizer" value="https://ci.appveyor.com/nuget/nugetizer3000" />
88
</packageSources>
9+
<disabledPackageSources>
10+
<clear />
11+
</disabledPackageSources>
912
</configuration>

‎src/Core/Merq.Core.Tests/Merq.Core.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Merq.props', '$(MSBuildThisFileDirectory)'))" />
33

44
<PropertyGroup>
5-
<TargetFramework>net47</TargetFramework>
5+
<TargetFramework>net472</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<DocumentationFile />
88
</PropertyGroup>

‎src/Vsix/Merq.Vsix.IntegrationTests/Merq.Vsix.IntegrationTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Merq.props', '$(MSBuildThisFileDirectory)'))" />
33

44
<PropertyGroup>
5-
<TargetFramework>net47</TargetFramework>
5+
<TargetFramework>net472</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<DocumentationFile />
88
</PropertyGroup>

‎src/Vsix/Merq.Vsix.Tests/Merq.Vsix.Tests.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Merq.props', '$(MSBuildThisFileDirectory)'))" />
33

44
<PropertyGroup>
5-
<TargetFramework>net47</TargetFramework>
5+
<TargetFramework>net472</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<DocumentationFile />
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="MSBuilder.ThisAssembly.Project" Version="0.3.3" PrivateAssets="all" />
12-
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" />
13-
<PackageReference Include="VSSDK.ComponentModelHost.11" Version="11.0.4" />
14-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.7.18" />
1512
<PackageReference Include="System.Reactive" Version="3.0.0" />
1613
<PackageReference Include="Moq" Version="4.5.10" />
1714
<PackageReference Include="xunit" Version="2.3.1" />

‎src/Vsix/Merq.Vsix/Merq.Vsix.BindingRedirects.targets

-96
This file was deleted.

‎src/Vsix/Merq.Vsix/Merq.Vsix.csproj

+28-46
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Sdk Name="Microsoft.Build.Artifacts" Version="2.0.16" />
3+
44
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9-
<ProjectGuid>{C9A505CA-F826-473A-8290-B36AF6BE56FB}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
5+
<TargetFramework>net472</TargetFramework>
126
<RootNamespace>Merq</RootNamespace>
13-
<AssemblyName>Merq.Vsix</AssemblyName>
147
<TargetVsixContainerName>Merq.vsix</TargetVsixContainerName>
15-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
16-
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
17-
<OldToolsVersion>12.0</OldToolsVersion>
18-
</PropertyGroup>
19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
20-
<Prefer32Bit>false</Prefer32Bit>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
23-
<Prefer32Bit>false</Prefer32Bit>
8+
<IncludeGlobalAssemblyInfo>false</IncludeGlobalAssemblyInfo>
249
</PropertyGroup>
10+
2511
<Import Project="Merq.Vsix.props" />
12+
2613
<ItemGroup>
27-
<Compile Include="Components\CommandBusComponent.cs" />
28-
<Compile Include="Components\DefaultExportProvider.cs" />
29-
<Compile Include="Components\EventStreamComponent.cs" />
30-
<Compile Include="MerqPackage.cs" />
31-
<Compile Include="Properties\AssemblyInfo.cs" />
32-
<Compile Include="Properties\Resources.Designer.cs">
14+
<Compile Update="Properties\Resources.Designer.cs">
3315
<AutoGen>True</AutoGen>
3416
<DesignTime>True</DesignTime>
3517
<DependentUpon>Resources.resx</DependentUpon>
3618
</Compile>
3719
</ItemGroup>
20+
3821
<ItemGroup>
3922
<Content Include="..\..\..\icon\200.png">
4023
<Link>200.png</Link>
@@ -48,11 +31,8 @@
4831
<Link>LICENSE</Link>
4932
<IncludeInVSIX>true</IncludeInVSIX>
5033
</Content>
51-
<None Include="Merq.Vsix.BindingRedirects.targets" />
52-
<None Include="Merq.Vsix.props" />
53-
<None Include="Merq.Vsix.targets" />
54-
<None Include="source.extension.vsixmanifest" />
5534
</ItemGroup>
35+
5636
<ItemGroup>
5737
<Reference Include="Microsoft.CSharp" />
5838
<Reference Include="PresentationCore" />
@@ -68,51 +48,53 @@
6848
<Reference Include="UIAutomationTypes" />
6949
<Reference Include="WindowsBase" />
7050
</ItemGroup>
71-
<ItemGroup />
51+
7252
<ItemGroup>
7353
<ProjectReference Include="..\..\Core\Merq.Core\Merq.Core.csproj">
74-
<Project>{33bdd9d1-3e01-49c1-ab46-50941dffd5d4}</Project>
7554
<Name>Merq.Core</Name>
7655
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup;BuiltProjectOutputGroupDependencies;DebugSymbolsProjectOutputGroupDependencies;SatelliteDllsProjectOutputGroupDependencies</IncludeOutputGroupsInVSIX>
7756
</ProjectReference>
7857
<ProjectReference Include="..\..\Core\Merq\Merq.csproj">
79-
<Project>{c6b16d17-4f6a-4457-8497-92068e53de39}</Project>
8058
<Name>Merq</Name>
8159
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup;BuiltProjectOutputGroupDependencies;DebugSymbolsProjectOutputGroupDependencies;SatelliteDllsProjectOutputGroupDependencies</IncludeOutputGroupsInVSIX>
8260
</ProjectReference>
8361
</ItemGroup>
62+
8463
<ItemGroup>
8564
<PackageReference Include="MSBuilder.ThisAssembly.Project" Version="0.3.3" PrivateAssets="all" />
86-
<PackageReference Include="netfx-System.StringResources" Version="3.0.14" />
65+
<PackageReference Include="netfx-System.StringResources" Version="3.0.14" PrivateAssets="all" />
8766
<PackageReference Include="Clarius.VisualStudio" Version="2.0.12" />
88-
<PackageReference Include="Microsoft.VisualStudio.SDK.VsixSuppression" Version="14.1.32" />
89-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.7.109" />
90-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.6.56" />
91-
<PackageReference Include="VSSDK.ComponentModelHost.11" Version="11.0.4" />
92-
<PackageReference Include="VSSDK.DTE.10" Version="10.0.4" />
93-
<PackageReference Include="VSSDK.IDE.11" Version="11.0.4" />
94-
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="*" />
95-
<PackageReference Include="VSSDK.VSLangProj.11" Version="11.0.4" />
67+
<PackageReference Include="Xamarin.VSSDK" Version="0.4.0-alpha.17" />
68+
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.9.3039" />
69+
<PackageReference Include="Xamarin.VSSDK.BuildTools" Version="0.4.0-alpha.17" />
70+
</ItemGroup>
71+
72+
<ItemGroup>
73+
<BindingRedirect Include="Merq" />
74+
<BindingRedirect Include="Merq.Core" />
9675
</ItemGroup>
76+
9777
<ItemGroup>
98-
<EmbeddedResource Include="MerqPackage.resx">
78+
<EmbeddedResource Update="MerqPackage.resx">
9979
<MergeWithCTO>true</MergeWithCTO>
10080
<ManifestResourceName>VSPackage</ManifestResourceName>
10181
<DependentUpon>MerqPackage.cs</DependentUpon>
10282
<SubType>Designer</SubType>
10383
</EmbeddedResource>
104-
<EmbeddedResource Include="Properties\Resources.resx">
84+
<EmbeddedResource Update="Properties\Resources.resx">
10585
<Generator>ResXFileCodeGenerator</Generator>
10686
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
10787
<SubType>Designer</SubType>
88+
<CustomToolNamespace>Merq.Properties</CustomToolNamespace>
10889
</EmbeddedResource>
10990
</ItemGroup>
110-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
111-
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(VsSDKVersion)' == '' And Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
91+
11292
<Import Project="Merq.Vsix.targets" />
93+
11394
<PropertyGroup>
11495
<StartAction>Program</StartAction>
11596
<StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
11697
<StartArguments>/rootsuffix Exp</StartArguments>
11798
</PropertyGroup>
99+
118100
</Project>

‎src/Vsix/Merq.Vsix/Merq.Vsix.props

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
<PropertyGroup>
66
<VerifyTargetVersion>false</VerifyTargetVersion>
7+
<BypassVsixValidation Condition="'$(CI)' == 'true'">true</BypassVsixValidation>
8+
<CreateVsixContainer>$(CI)</CreateVsixContainer>
9+
710
<UseCodebase>true</UseCodebase>
811
<IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
912
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
@@ -13,4 +16,9 @@
1316
<IsProductComponent>true</IsProductComponent>
1417
</PropertyGroup>
1518

19+
<PropertyGroup Label="Artifacts SDK">
20+
<ArtifactsPath Condition="'$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != ''">$(BUILD_ARTIFACTSTAGINGDIRECTORY)/artifacts</ArtifactsPath>
21+
<DefaultArtifactsFileMatch>Merq*dll Merq*pdb</DefaultArtifactsFileMatch>
22+
</PropertyGroup>
23+
1624
</Project>

‎src/Vsix/Merq.Vsix/Merq.Vsix.targets

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="Merq.Vsix.BindingRedirects.targets" />
4-
<Import Project="$(VsSDKInstall)\Microsoft.VsSDK.targets" Condition="'$(VsSDKVersion)' == '' And Exists('$(VsSDKInstall)\Microsoft.VsSDK.targets')" />
5-
3+
64
<PropertyGroup>
75
<IsSystemComponent Condition="'$(IsSystemComponent)' == '' And '$(Configuration)' == 'Debug'">false</IsSystemComponent>
86
<IsExperimental Condition="'$(IsExperimental)' == '' And '$(Configuration)' == 'Debug'">true</IsExperimental>

‎src/Vsix/Merq.Vsix/Properties/Resources.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Vsix/Merq.Vsix/source.extension.vsixmanifest

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
2121
</Prerequisites>
2222
<Assets>
23-
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
24-
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
23+
<Asset Type="Microsoft.VisualStudio.VsPackage" Path="BindingRedirects.pkgdef" />
24+
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
25+
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
2526
</Assets>
2627
</PackageManifest>

0 commit comments

Comments
 (0)