Skip to content

Commit

Permalink
Version 1.4.20
Browse files Browse the repository at this point in the history 
Upgrade to CodeFirstWebFramework 1.1.7
Add missing files to setup project
  • Loading branch information
@nikkilocke
nikkilocke committed Sep 10, 2018
1 parent 03b2f11 commit ac88961
Show file tree
Hide file tree
Showing 4 changed files with 574 additions and 239 deletions.
49 changes: 24 additions & 25 deletions AccountServer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -25,11 +27,9 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.10.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -62,29 +62,38 @@
<ManifestKeyFile>AccountServer_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="CodeFirstWebFramework, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\CodeFirstWebFramework.1.1.7\lib\net452\CodeFirstWebFramework.dll</HintPath>
</Reference>
<Reference Include="Markdig, Version=0.14.9.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Markdig.0.14.9\lib\net40\Markdig.dll</HintPath>
<Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="Markdig, Version=0.15.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Markdig.0.15.2\lib\net40\Markdig.dll</HintPath>
</Reference>
<Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\Mono.Data.Sqlite.dll</HintPath>
</Reference>
<Reference Include="mustache-sharp, Version=0.2.10.0, Culture=neutral, PublicKeyToken=40ca26c1e088cef4, processorArchitecture=MSIL">
<HintPath>packages\mustache-sharp.0.2.10\lib\net40\mustache-sharp.dll</HintPath>
<Reference Include="mustache-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5885df51f4df0041, processorArchitecture=MSIL">
<HintPath>packages\mustache-sharp.1.0.0\lib\net45\mustache-sharp.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.10.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.6.10.6\lib\net452\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=8.0.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.8.0.12\lib\net452\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel" />
Expand Down Expand Up @@ -210,17 +219,6 @@
<Content Include="contentFiles\CodeFirstWebFramework\skin\default.js" />
<Content Include="contentFiles\CodeFirstWebFramework\skin\styled.css" />
<Content Include="contentFiles\CodeFirstWebFramework\skin\styled.js" />
<Content Include="MySqlCommand.xml" />
<Content Include="MySqlCommandBuilder.xml" />
<Content Include="MySqlConnection.xml" />
<Content Include="MySqlConnectionStringBuilder.xml" />
<Content Include="MySqlDataAdapter.xml" />
<Content Include="MySqlDataReader.xml" />
<Content Include="MySqlException.xml" />
<Content Include="MySqlHelper.xml" />
<Content Include="MySqlParameter.xml" />
<Content Include="MySqlParameterCollection.xml" />
<Content Include="MySqlTransaction.xml" />
<Content Include="packages.config" />
<Content Include="README.md" />
<Content Include="AccountServer\help\navigation.md" />
Expand Down Expand Up @@ -248,6 +246,7 @@
<None Include="contentFiles\CodeFirstWebFramework\help\navigation.md" />
<None Include="contentFiles\CodeFirstWebFramework\listform.tmpl" />
<None Include="contentFiles\Documentation.md" />
<None Include="Properties\app.manifest" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
Expand All @@ -267,12 +266,12 @@
xcopy /E /I /Y "$(SolutionDir)AccountServer" "$(TargetDir)AccountServer"
</PostBuildEvent>
</PropertyGroup>
<Import Project="packages\Vsxmd.1.2.0\build\Vsxmd.targets" Condition="Exists('packages\Vsxmd.1.2.0\build\Vsxmd.targets')" />
<Import Project="packages\Vsxmd.1.3.3\build\Vsxmd.targets" Condition="Exists('packages\Vsxmd.1.3.3\build\Vsxmd.targets')" />
<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\Vsxmd.1.2.0\build\Vsxmd.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Vsxmd.1.2.0\build\Vsxmd.targets'))" />
<Error Condition="!Exists('packages\Vsxmd.1.3.3\build\Vsxmd.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Vsxmd.1.3.3\build\Vsxmd.targets'))" />
</Target>
<!-- 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.
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.19.*")]
[assembly: AssemblyFileVersion("1.4.19.*")]
[assembly: AssemblyVersion("1.4.20.*")]
[assembly: AssemblyFileVersion("1.4.20.*")]
Loading

0 comments on commit ac88961

Please sign in to comment.