Skip to content

Update Antlr4 packages to fix building in VS2017 #53

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

Open
kariudo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Antlr4 packages to fix building in VS2017 #53

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
6 changes: 3 additions & 3 deletions deployment/owin-scim-host/owin-scim-host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<Use64BitIISExpress />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -48,9 +49,8 @@
<HintPath>..\..\Packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Antlr4.Runtime, Version=4.5.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.2\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion deployment/owin-scim-host/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.5.0.2" targetFramework="net452" />
<package id="Antlr4.Runtime" version="4.5.3" targetFramework="net452" />
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net452" />
<package id="bootstrap" version="3.3.7" targetFramework="net452" />
<package id="jQuery" version="2.2.3" targetFramework="net452" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
Expand Down
5 changes: 2 additions & 3 deletions samples/ConsoleHost/ConsoleHost/ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr4.Runtime, Version=4.5.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="Autofac, Version=4.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\Autofac.4.2.1\lib\net45\Autofac.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion samples/ConsoleHost/ConsoleHost/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4.Runtime" version="4.5.3" targetFramework="net451" />
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net451" />
<package id="Autofac" version="4.2.1" targetFramework="net451" />
<package id="AutoMapper" version="5.2.0" targetFramework="net451" />
<package id="FluentValidation" version="6.2.1.0" targetFramework="net451" />
Expand Down
25 changes: 11 additions & 14 deletions source/Owin.Scim.Antlr/Owin.Scim.Antlr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\Packages\Antlr4.4.5.3\build\Antlr4.props" Condition="Exists('..\..\Packages\Antlr4.4.5.3\build\Antlr4.props')" />
<Import Project="..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.props" Condition="Exists('..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -36,9 +36,8 @@
<DocumentationFile>..\lib\Owin.Scim.Antlr.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr4.Runtime, Version=4.5.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -61,23 +60,21 @@
</Antlr4>
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\..\Packages\Antlr4.4.5.3\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Antlr4.4.5.3\build\Antlr4.props'))" />
<Error Condition="!Exists('..\..\Packages\Antlr4.4.5.3\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Antlr4.4.5.3\build\Antlr4.targets'))" />
<Error Condition="!Exists('..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.props'))" />
<Error Condition="!Exists('..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.targets'))" />
</Target>
<Import Project="..\..\Packages\Antlr4.4.5.3\build\Antlr4.targets" Condition="Exists('..\..\Packages\Antlr4.4.5.3\build\Antlr4.targets')" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.targets" Condition="Exists('..\..\Packages\Antlr4.CodeGenerator.4.6.6\build\Antlr4.CodeGenerator.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
5 changes: 3 additions & 2 deletions source/Owin.Scim.Antlr/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4" version="4.5.3" targetFramework="net45" developmentDependency="true" />
<package id="Antlr4.Runtime" version="4.5.3" targetFramework="net45" />
<package id="Antlr4" version="4.6.6" targetFramework="net45" developmentDependency="true" />
<package id="Antlr4.CodeGenerator" version="4.6.6" targetFramework="net45" developmentDependency="true" />
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net45" />
</packages>
5 changes: 2 additions & 3 deletions source/Owin.Scim/Owin.Scim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@
<LangVersion>5</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr4.Runtime, Version=4.5.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\Packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\Packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion source/Owin.Scim/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4.Runtime" version="4.5.3" targetFramework="net451" />
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net451" />
<package id="DryIoc" version="2.5.1" targetFramework="net451" developmentDependency="true" />
<package id="DryIoc.Owin" version="2.0.1" targetFramework="net451" developmentDependency="true" />
<package id="DryIoc.WebApi" version="2.1.0" targetFramework="net451" developmentDependency="true" />
Expand Down
5 changes: 2 additions & 3 deletions source/_tests/Owin.Scim.Tests/Owin.Scim.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@
<LangVersion>5</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="Antlr4.Runtime, Version=4.5.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\Antlr4.Runtime.4.5.3\lib\net45\Antlr4.Runtime.dll</HintPath>
<Private>True</Private>
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\Antlr4.Runtime.4.6.6\lib\net45\Antlr4.Runtime.dll</HintPath>
</Reference>
<Reference Include="FakeItEasy, Version=2.3.1.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
<HintPath>..\..\..\Packages\FakeItEasy.2.3.1\lib\net40\FakeItEasy.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion source/_tests/Owin.Scim.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr4.Runtime" version="4.5.3" targetFramework="net451" />
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net451" />
<package id="AutoFixture" version="3.50.2" targetFramework="net451" />
<package id="FakeItEasy" version="2.3.1" targetFramework="net451" />
<package id="FluentValidation" version="6.2.1.0" targetFramework="net451" />
Expand Down