Skip to content

Commit

Permalink
Updated to PostSharp 5.0.33 and Visual Studio 2017.
Browse files Browse the repository at this point in the history
  • Loading branch information
@prochan2
prochan2 committed Sep 18, 2017
1 parent bbd6d0a commit e7d62bf
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 37 deletions.
44 changes: 25 additions & 19 deletions PostSharp.LicenseServer.sln
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostSharp.LicenseServer", "src\PostSharp.LicenseServer\PostSharp.LicenseServer.csproj", "{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostSharp.LicenseServer.Test", "test\PostSharp.LicenseServer.Test\PostSharp.LicenseServer.Test.csproj", "{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostSharp.LicenseServer", "src\PostSharp.LicenseServer\PostSharp.LicenseServer.csproj", "{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -20,21 +20,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Mixed Platforms.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Mixed Platforms.Build.0 = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|x86.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Any CPU.Build.0 = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|x86.ActiveCfg = Release|Any CPU
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Debug|Any CPU.ActiveCfg = Debug|x86
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Debug|Mixed Platforms.Build.0 = Debug|x86
Expand All @@ -50,8 +35,29 @@ Global
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Release|Mixed Platforms.Build.0 = Release|x86
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Release|x86.ActiveCfg = Release|x86
{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}.Release|x86.Build.0 = Release|x86
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Debug|x86.Build.0 = Debug|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Mixed Platforms.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|Mixed Platforms.Build.0 = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|x86.ActiveCfg = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Documentation|x86.Build.0 = Documentation|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Any CPU.Build.0 = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|x86.ActiveCfg = Release|Any CPU
{3B511E09-1CFD-43EB-978F-70FA3DFEC83B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A33D862C-49E9-4001-BD4B-268BD053EE77}
EndGlobalSection
EndGlobal
23 changes: 10 additions & 13 deletions src/PostSharp.LicenseServer/PostSharp.LicenseServer.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\PostSharp.5.0.32\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.5.0.32\build\PostSharp.props')" />
<Import Project="..\..\packages\PostSharp.5.0.33\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.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 @@ -73,17 +73,14 @@
<SkipPostSharp>True</SkipPostSharp>
</PropertyGroup>
<ItemGroup>
<Reference Include="PostSharp, Version=5.0.32.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Redist.5.0.32\lib\net45\PostSharp.dll</HintPath>
<Private>True</Private>
<Reference Include="PostSharp, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Redist.5.0.33\lib\net45\PostSharp.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Compiler.Common, Version=5.0.32.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Compiler.Common.5.0.32\lib\net45\PostSharp.Compiler.Common.dll</HintPath>
<Private>True</Private>
<Reference Include="PostSharp.Compiler.Common, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Compiler.Common.5.0.33\lib\net45\PostSharp.Compiler.Common.dll</HintPath>
</Reference>
<Reference Include="PostSharp.Compiler.Settings, Version=5.0.32.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Compiler.Settings.5.0.32\lib\net45\PostSharp.Compiler.Settings.dll</HintPath>
<Private>True</Private>
<Reference Include="PostSharp.Compiler.Settings, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
<HintPath>..\..\packages\PostSharp.Compiler.Settings.5.0.33\lib\net45\PostSharp.Compiler.Settings.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -281,11 +278,11 @@
<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\PostSharp.5.0.26-rc\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.26-rc\build\PostSharp.targets'))" />
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.32\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.32\build\PostSharp.props'))" />
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.32\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.32\build\PostSharp.targets'))" />
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.33\build\PostSharp.props'))" />
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.33\build\PostSharp.targets'))" />
</Target>
<Import Project="..\..\packages\PostSharp.5.0.23-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.23-preview\build\PostSharp.targets')" />
<Import Project="..\..\packages\PostSharp.5.0.32\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.32\build\PostSharp.targets')" />
<Import Project="..\..\packages\PostSharp.5.0.33\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.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
2 changes: 1 addition & 1 deletion src/PostSharp.LicenseServer/Web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.23.0" newVersion="5.0.23.0" />
<bindingRedirect oldVersion="0.0.0.0-5.0.33.0" newVersion="5.0.33.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
8 changes: 4 additions & 4 deletions src/PostSharp.LicenseServer/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSBuildTasks" version="1.4.0.88" targetFramework="net45" />
<package id="PostSharp" version="5.0.32" targetFramework="net45" developmentDependency="true" />
<package id="PostSharp.Compiler.Common" version="5.0.32" targetFramework="net45" />
<package id="PostSharp.Compiler.Settings" version="5.0.32" targetFramework="net45" />
<package id="PostSharp.Redist" version="5.0.32" targetFramework="net45" />
<package id="PostSharp" version="5.0.33" targetFramework="net45" developmentDependency="true" />
<package id="PostSharp.Compiler.Common" version="5.0.33" targetFramework="net45" />
<package id="PostSharp.Compiler.Settings" version="5.0.33" targetFramework="net45" />
<package id="PostSharp.Redist" version="5.0.33" targetFramework="net45" />
</packages>

0 comments on commit e7d62bf

Please sign in to comment.