Skip to content

Commit 076e02f

Browse files
prochan2prochan2
committed
PostSharp version upgraded to 6.6.15, requiring changing target framework version to 4.7.2. NuGet client upgraded to 5.7.0. Product name made optional when acquiring a lease.
1 parent e7d62bf commit 076e02f

File tree

14 files changed

+63
-68
lines changed

14 files changed

+63
-68
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/packages
22
/*.suo
33
bin
4-
obj
4+
obj
5+
/.build
6+
/.vs

‎.nuget/nuget.exe‎

2.74 MB
Binary file not shown.

‎PostSharp.LicenseServer.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.12
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30523.141
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostSharp.LicenseServer.Test", "test\PostSharp.LicenseServer.Test\PostSharp.LicenseServer.Test.csproj", "{6A706191-B0A4-4B9A-A597-7A1DAF32EA50}"
77
EndProject

‎src/PostSharp.LicenseServer/DataClasses.designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/PostSharp.LicenseServer/Lease.ashx.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ public void ProcessRequest(HttpContext context)
4848

4949
// Parse requested product code.
5050
string productCode = context.Request.QueryString["product"];
51-
if (string.IsNullOrEmpty(productCode))
52-
{
53-
this.SetError(400, "Missing query string argument: product.");
54-
return;
55-
}
5651

5752
// Parse version.
5853
string versionString = context.Request.QueryString["version"];

‎src/PostSharp.LicenseServer/LeaseService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ private static LicenseState GetLicenseState(Database db, License license, Versio
145145

146146
public LicenseLease GetLicenseLease(Database db, string productCode, Version version, DateTime? buildDate, string machine, string userName, string authenticatedUserName, DateTime now, Dictionary<int, string> errors)
147147
{
148-
Settings settings = Settings.Default;
149-
150-
// Get suitable active licenses.
148+
Settings settings = Settings.Default;
149+
150+
// Get suitable active licenses.
151151
License[] licenses = (from license in db.Licenses
152-
where license.ProductCode == productCode && license.Priority >= 0
152+
where (string.IsNullOrEmpty(productCode) || license.ProductCode == productCode) && license.Priority >= 0
153153
orderby license.Priority
154154
select license).ToArray();
155155

‎src/PostSharp.LicenseServer/PostSharp.LicenseServer.csproj‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.5.0.33\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.props')" />
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\PostSharp.6.6.15\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.6.15\build\PostSharp.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,7 +14,7 @@
1414
<AppDesignerFolder>Properties</AppDesignerFolder>
1515
<RootNamespace>PostSharp.LicenseServer</RootNamespace>
1616
<AssemblyName>PostSharp.LicenseServer</AssemblyName>
17-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1818
<UseIISExpress>true</UseIISExpress>
1919
<FileUpgradeFlags>
2020
</FileUpgradeFlags>
@@ -26,7 +26,7 @@
2626
<IISExpressWindowsAuthentication />
2727
<IISExpressUseClassicPipelineMode />
2828
<TargetFrameworkProfile />
29-
<MSBuildCommunityTasksPath>$(MSBuildThisFileDirectory)..\..\packages\MSBuildTasks.1.4.0.88\tools</MSBuildCommunityTasksPath>
29+
<MSBuildCommunityTasksPath>$(MSBuildThisFileDirectory)..\..\packages\MSBuildTasks.1.5.0.235\tools</MSBuildCommunityTasksPath>
3030
<NuGetPackageImportStamp>
3131
</NuGetPackageImportStamp>
3232
</PropertyGroup>
@@ -73,27 +73,26 @@
7373
<SkipPostSharp>True</SkipPostSharp>
7474
</PropertyGroup>
7575
<ItemGroup>
76-
<Reference Include="PostSharp, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\PostSharp.Redist.5.0.33\lib\net45\PostSharp.dll</HintPath>
76+
<Reference Include="PostSharp, Version=6.6.15.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\PostSharp.Redist.6.6.15\lib\net45\PostSharp.dll</HintPath>
7878
</Reference>
7979
<Reference Include="PostSharp.Compiler.Common, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\PostSharp.Compiler.Common.5.0.33\lib\net45\PostSharp.Compiler.Common.dll</HintPath>
80+
<HintPath>..\..\packages\PostSharp.Compiler.Common.6.6.15\lib\netstandard2.0\PostSharp.Compiler.Common.dll</HintPath>
81+
<Private>True</Private>
8182
</Reference>
8283
<Reference Include="PostSharp.Compiler.Settings, Version=5.0.33.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\PostSharp.Compiler.Settings.5.0.33\lib\net45\PostSharp.Compiler.Settings.dll</HintPath>
84+
<HintPath>..\..\packages\PostSharp.Compiler.Settings.6.6.15\lib\netstandard2.0\PostSharp.Compiler.Settings.dll</HintPath>
85+
<Private>True</Private>
8486
</Reference>
8587
<Reference Include="System" />
8688
<Reference Include="System.Data" />
87-
<Reference Include="System.Data.DataSetExtensions" />
8889
<Reference Include="System.Data.Linq" />
8990
<Reference Include="System.Web" />
9091
<Reference Include="System.Web.ApplicationServices" />
9192
<Reference Include="System.Web.DynamicData" />
9293
<Reference Include="System.Web.Entity" />
93-
<Reference Include="System.Web.Extensions" />
9494
<Reference Include="System.Xml" />
9595
<Reference Include="System.Configuration" />
96-
<Reference Include="System.Xml.Linq" />
9796
</ItemGroup>
9897
<ItemGroup>
9998
<Content Include="Admin\AddLicense.aspx" />
@@ -277,12 +276,12 @@
277276
<PropertyGroup>
278277
<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>
279278
</PropertyGroup>
280-
<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'))" />
281-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.33\build\PostSharp.props'))" />
282-
<Error Condition="!Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.5.0.33\build\PostSharp.targets'))" />
279+
<Error Condition="!Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
280+
<Error Condition="!Exists('..\..\packages\PostSharp.6.6.15\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.6.15\build\PostSharp.props'))" />
281+
<Error Condition="!Exists('..\..\packages\PostSharp.6.6.15\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.6.15\build\PostSharp.targets'))" />
283282
</Target>
284-
<Import Project="..\..\packages\PostSharp.5.0.23-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.23-preview\build\PostSharp.targets')" />
285-
<Import Project="..\..\packages\PostSharp.5.0.33\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.5.0.33\build\PostSharp.targets')" />
283+
<Import Project="..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
284+
<Import Project="..\..\packages\PostSharp.6.6.15\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.6.15\build\PostSharp.targets')" />
286285
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
287286
Other similar extension points exist, see Microsoft.Common.targets.
288287
<Target Name="BeforeBuild">

‎src/PostSharp.LicenseServer/PostSharp.LicenseServer.csproj.user‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<IISExpressWindowsAuthentication />
88
<IISExpressUseClassicPipelineMode />
99
<UseGlobalApplicationHostFile />
10+
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
11+
<Use64BitIISExpress />
1012
</PropertyGroup>
1113
<ProjectExtensions>
1214
<VisualStudio>

‎src/PostSharp.LicenseServer/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/PostSharp.LicenseServer/Web.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="PostSharp.LicenseServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<section name="PostSharp.LicenseServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<!--
@@ -14,19 +14,19 @@
1414
</system.Web>
1515
-->
1616
<system.web>
17-
<compilation debug="true" targetFramework="4.5">
17+
<compilation debug="true" targetFramework="4.7.2">
1818
<assemblies>
19-
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
19+
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
2020
</assemblies>
2121
</compilation>
22-
<authentication mode="Windows" />
22+
<authentication mode="Windows"/>
2323
<authorization>
2424
<!-- TODO: Configure security of the license service. Define which users are allowed to borrow a license. -->
2525
<!--
2626
<deny users="?" />
2727
-->
2828
</authorization>
29-
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
29+
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
3030
</system.web>
3131
<location path="Admin">
3232
<system.web>
@@ -42,7 +42,7 @@
4242
<location path="Documentation">
4343
<system.web>
4444
<authorization>
45-
<deny users="*" />
45+
<deny users="*"/>
4646
</authorization>
4747
</system.web>
4848
</location>
@@ -122,21 +122,21 @@
122122
</applicationSettings>
123123
<connectionStrings>
124124
<!-- TODO: Set the connection string to the license server -->
125-
<add name="SharpCrafters_LicenseServerConnectionString" connectionString="Data Source=mssql2.kpy.sharpcrafters.com;Initial Catalog=LicenseServer_Dev;Integrated Security=True" providerName="System.Data.SqlClient" />
125+
<add name="SharpCrafters_LicenseServerConnectionString" connectionString="Data Source=(LocalDb)\PostSharpLicenseServer;Initial Catalog=PostSharpLicenseServer;Integrated Security=True" providerName="System.Data.SqlClient"/>
126126
</connectionStrings>
127127
<system.net>
128128
<mailSettings>
129129
<smtp>
130130
<!-- TODO: Set the host to the SMTP server-->
131-
<network host="smtp.kpy.sharpcrafters.com" />
131+
<network host="smtp.kpy.sharpcrafters.com"/>
132132
</smtp>
133133
</mailSettings>
134134
</system.net>
135135
<runtime>
136136
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
137137
<dependentAssembly>
138-
<assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
139-
<bindingRedirect oldVersion="0.0.0.0-5.0.33.0" newVersion="5.0.33.0" />
138+
<assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral"/>
139+
<bindingRedirect oldVersion="0.0.0.0-6.6.15.0" newVersion="6.6.15.0"/>
140140
</dependentAssembly>
141141
</assemblyBinding>
142142
</runtime>

0 commit comments

Comments
 (0)