Skip to content

fix build fail #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ElizabethOkerio merged 1 commit into from
Aug 30, 2022
Merged

fix build fail #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions src/ODataConnectedService/ODataConnectedService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,32 +138,16 @@
<PackageReference Include="Microsoft.OData.Edm">
<Version>7.6.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost">
<Version>15.7.27703</Version>
<PackageReference Include="Microsoft.VisualStudio.SDK">
<Version>17.3.32804.24</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ConnectedServices">
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.CoreUtility">
<Version>15.0.26201</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Imaging">
<Version>15.0.26201</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0">
<Version>14.3.25407</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading">
<Version>15.0.240</Version>
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<Version>17.3.2094</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.VisualStudio">
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="VSLangProj">
<Version>7.0.3301</Version>
<Version>13.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
20 changes: 11 additions & 9 deletions src/ODataConnectedService_VS2022Plus/ODataConnectedService_VS2022Plus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,17 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>OcsKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="OcsKey.snk" />
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down Expand Up @@ -81,19 +88,14 @@
<PackageReference Include="Microsoft.OData.Edm">
<Version>7.6.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.2.32505.173" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.VisualStudio.SDK">
<Version>17.3.32804.24</Version>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.2.2186">
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<Version>17.3.2094</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ConnectedServices">
<Version>16.2.45</Version>
</PackageReference>
<PackageReference Include="NuGet.VisualStudio">
<Version>6.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
Expand Down
Binary file added src/ODataConnectedService_VS2022Plus/OcsKey.snk
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/ODataConnectedService_VS2022Plus/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand Down Expand Up @@ -30,3 +31,5 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

[assembly: InternalsVisibleTo("ODataConnectedService.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001003d2fbcc3c5595b4212227a5ca0fb1c45cb9c942096831420563dc169dd847a8a5fe068170bd10802dea50bc4d8342c1f8aa2ab9f27e3ceccdb21ce8c1415c3ea33eb7bc09059ca50b3e8607fa34bb9925466525ceffc3edac84ac1863afc28ef935c8db7a6430771fa41aa3de8a8d399990b02cae85e834e5d29d2cc0109b8cb")]
28 changes: 10 additions & 18 deletions test/ODataConnectedService.Tests/ODataConnectedService.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -48,10 +48,6 @@
<AssemblyOriginatorKeyFile>OcsKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.OData.ConnectedService.Fakes">
<HintPath>FakesAssemblies\Microsoft.OData.ConnectedService.Fakes.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -100,9 +96,6 @@
<Compile Include="Views\UserSettingsTest.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="EnvDTE">
<Version>8.0.2</Version>
</PackageReference>
<PackageReference Include="FluentAssertions">
<Version>2.0.0.1</Version>
</PackageReference>
Expand All @@ -114,14 +107,13 @@
<PackageReference Include="Microsoft.OData.Client">
<Version>7.6.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost">
<Version>15.7.27703</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ConnectedServices">
<Version>2.0.0</Version>
<PackageReference Include="Microsoft.VisualStudio.SDK">
<Version>17.3.32804.24</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Shell.Immutable.11.0">
<Version>11.0.50727</Version>
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<Version>17.3.2094</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq">
<Version>4.13.1</Version>
Expand Down Expand Up @@ -158,9 +150,9 @@
<Project>{86faaaec-3bbd-479c-8a44-d2715a6bd4c1}</Project>
<Name>Microsoft.OData.CodeGen</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\ODataConnectedService\ODataConnectedService.csproj">
<Project>{a8bc5b8e-9ab7-4257-b8f1-e7c62169f9b5}</Project>
<Name>ODataConnectedService</Name>
<ProjectReference Include="..\..\src\ODataConnectedService_VS2022Plus\ODataConnectedService_VS2022Plus.csproj">
<Project>{15769dab-f3b0-4e82-a125-cf55acb04d07}</Project>
<Name>ODataConnectedService_VS2022Plus</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down