Skip to content

Commit

Permalink
Update Nugets packages #364
Browse files Browse the repository at this point in the history
  • Loading branch information
apobekiaris committed Apr 10, 2019
1 parent bd47f47 commit 2af2948
Show file tree
Hide file tree
Showing 38 changed files with 74 additions and 103 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<AssemblyName>FeatureCenter.Module</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<FileUpgradeFlags>
</FileUpgradeFlags>
<FileUpgradeFlags></FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<OutputPath>bin\Debug\</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
<RootNamespace>ExcelImporterTester.Module.Web</RootNamespace>
<AssemblyName>ExcelImporterTester.Module.Web</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
<RootNamespace>ExcelImporterTester.Module</RootNamespace>
<AssemblyName>ExcelImporterTester.Module</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<LangVersion>latest</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SecurityDemo.Module</RootNamespace>
<AssemblyName>SecurityDemo.Module</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
<FileUpgradeFlags></FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<UpgradeBackupLocation></UpgradeBackupLocation>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
Expand Down
1 change: 1 addition & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The _eXpandFramework_ team have extended the capabilities of the _eXpressApp Fra
The main idea _behind eXpandFramework_ is to offer as many features as possible to developers/business users through a declarative approach (configuring files rather than writing code). Please go through each of the following brief descriptions and find out how _eXpandFramework_ can help you accomplish your complex development tasks with easy declarative programming. Below you can see some descriptions and screenshots of our basic modules (screenshots taken from eXpand FeatureCenter application that comes along with the download). In the folder _Demos_ you can find a list of demos like _XVideoRental_, _SecurityDemo_, _MiddleTier_, _Workflow_ and _installation helper solutions for each module_.

## Modules
Additional standalone well documented/tested modules that work with ALL XAF versions and may not distributed from this repository can be found at [DevExpresss.XAF](https://github.com/eXpandFramework/DevExpress.XAF) repository.

Examples of those modules include (in the two right columns you can see the supported platform):

Expand Down
3 changes: 1 addition & 2 deletions Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<AssemblyName>Xpand.Test.WorldCreator</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<LangVersion>latest</LangVersion>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
6 changes: 2 additions & 4 deletions Tests/Xpand.Test/Xpand.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<LangVersion>latest</LangVersion>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -42,8 +41,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
</StartupObject>
<StartupObject></StartupObject>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
Expand Down
Binary file not shown.
Binary file not shown.
12 changes: 4 additions & 8 deletions Xpand.Plugins/Xpand.VSIX/Xpand.VSIX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
<PropertyGroup>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<LangVersion>latest</LangVersion>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>14.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down Expand Up @@ -479,8 +476,7 @@
</Target>
-->
<Target Name="BeforeBuild">
</Target>
<Target Name="BeforeBuild"></Target>
<Import Project="..\..\Support\_third_party_assemblies\Packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
<Import Project="..\..\Support\_third_party_assemblies\Packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Microsoft.VSSDK.BuildTools.15.6.170\build\Microsoft.VSSDK.BuildTools.targets')" />
<Import Project="..\..\Support\_third_party_assemblies\Packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\..\Support\_third_party_assemblies\Packages\Fody.4.2.1\build\Fody.targets')" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
<LangVersion>latest</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
<Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="fasterflect" version="2.1.3" targetFramework="net40" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
<package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
<LangVersion>latest</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
<Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Xpand/Xpand.ExpressApp.Modules/AuditTrail/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="fasterflect" version="2.1.3" targetFramework="net40" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
<package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Xpand.DLL\Xpand.Utils.dll</HintPath>
</Reference>
<Reference Include="Xpand.XAF.Modules.Reactive, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
<Reference Include="Xpand.XAF.Modules.Reactive, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.Reactive.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.Reactive.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.1.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
<Reference Include="Xpand.XAF.Modules.ViewEditMode, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c52ffed5d5ff0958">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Xpand.XAF.Modules.ViewEditMode.1.2.0\lib\net4.6.1\Xpand.XAF.Modules.ViewEditMode.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xpand.Xpo">
Expand Down Expand Up @@ -283,11 +283,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
<LangVersion>latest</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
<Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions Xpand/Xpand.ExpressApp.Modules/Dashboard/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
<package id="Xpand.XAF.Modules.Reactive" version="1.1.0" targetFramework="net461" />
<package id="Xpand.XAF.Modules.ViewEditMode" version="1.1.0" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
<package id="Xpand.XAF.Modules.Reactive" version="1.2.0" targetFramework="net461" />
<package id="Xpand.XAF.Modules.ViewEditMode" version="1.2.0" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ if exist "$(TargetPath)" if not exist "$(TargetPath).locked" move "$(TargetPath)
<LangVersion>latest</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" />
<Import Project="..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets" Condition="Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.6\build\Xpand.VersionConverter.targets'))" />
<Error Condition="!Exists('..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Support\_third_party_assemblies\Packages\Xpand.VersionConverter.1.0.8\build\Xpand.VersionConverter.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Xpand/Xpand.ExpressApp.Modules/Email/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
<package id="RazorEngine" version="3.10.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.6" targetFramework="net461" />
<package id="Xpand.VersionConverter" version="1.0.8" targetFramework="net461" />
<package id="Xpand.XAF.Modules.ModelViewInheritance" version="1.1.0" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
<AssemblyName>Xpand.ExpressApp.ExcelImporter.Web</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\..\Xpand.Key\Xpand.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<LangVersion>latest</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
<AssemblyName>Xpand.ExpressApp.ExcelImporter.Win</AssemblyName>
<AssemblyOriginatorKeyFile>..\..\..\Xpand.Key\Xpand.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<LangVersion>latest</LangVersion>
Expand Down
Loading

0 comments on commit 2af2948

Please sign in to comment.