Compare commits

..

1 Commits
master ... v1.0

Author SHA1 Message Date
4ff37585f5 Prepare to v1.0 2017-10-15 12:39:20 +02:00
55 changed files with 521 additions and 16809 deletions

View File

@ -10,7 +10,6 @@ Public Class AddMachine
addMachine_IdForm = Nothing
NewIDBox.Text = newID
If NewIDBox.Text = "" Then Me.Close()
NewNameBox.Focus()
NewEtatBox.SelectedIndex = 0
End Sub

View File

@ -101,7 +101,6 @@ Partial Class AddMachine_ID
Me.AcceptButton = Me.NextButton
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.AddMachine_ID_CancelButton
Me.CausesValidation = False
Me.ClientSize = New System.Drawing.Size(360, 167)
Me.Controls.Add(Me.RandomIDButton)

View File

@ -35,8 +35,8 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>0.11.3.0</ApplicationVersion>
<ApplicationRevision>3</ApplicationRevision>
<ApplicationVersion>0.11.2.3</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
@ -82,14 +82,13 @@
<ApplicationIcon>InvManLogo.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>JCS.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
<SignManifests>true</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>620A13A82ECD693F86DBAEDE2FA8737A6A18D351</ManifestCertificateThumbprint>
@ -114,8 +113,8 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net451\System.Data.SQLite.dll</HintPath>
<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.105.2\lib\net451\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
@ -232,6 +231,8 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="ISEN-Repair Inventory Manager_TemporaryKey.pfx" />
<None Include="JCS.pfx" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>
@ -267,11 +268,11 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets')" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.105.2\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.105.2\build\net451\System.Data.SQLite.Core.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets'))" />
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.105.2\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.105.2\build\net451\System.Data.SQLite.Core.targets'))" />
</Target>
</Project>

View File

@ -36,8 +36,6 @@ Partial Class Main
Me.StatusLabel = New System.Windows.Forms.ToolStripStatusLabel()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.InvList = New System.Windows.Forms.ListBox()
Me.SendOutButton = New System.Windows.Forms.Button()
Me.TrashButton = New System.Windows.Forms.Button()
Me.Label1 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
@ -52,26 +50,12 @@ Partial Class Main
Me.GivenByBox = New System.Windows.Forms.TextBox()
Me.Label8 = New System.Windows.Forms.Label()
Me.EtatBox = New System.Windows.Forms.TextBox()
Me.HWCheck = New System.Windows.Forms.CheckBox()
Me.OSCheck = New System.Windows.Forms.CheckBox()
Me.DrvCheck = New System.Windows.Forms.CheckBox()
Me.SoftCheck = New System.Windows.Forms.CheckBox()
Me.ActivateCheck = New System.Windows.Forms.CheckBox()
Me.ComputerRepairGlobalProgress = New System.Windows.Forms.ProgressBar()
Me.Label6 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
Me.MemBox = New System.Windows.Forms.TextBox()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.OSBox = New System.Windows.Forms.TextBox()
Me.ArchBox = New System.Windows.Forms.TextBox()
Me.EditButton = New System.Windows.Forms.Button()
Me.OpenBackupFile = New System.Windows.Forms.OpenFileDialog()
Me.SaveBackupFile = New System.Windows.Forms.SaveFileDialog()
Me.MenuStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.SuspendLayout()
'
'MenuStrip1
@ -168,31 +152,6 @@ Partial Class Main
Me.InvList.TabIndex = 1
Me.InvList.TabStop = False
'
'SendOutButton
'
Me.SendOutButton.BackColor = System.Drawing.Color.Green
Me.SendOutButton.Enabled = False
Me.SendOutButton.Location = New System.Drawing.Point(701, 343)
Me.SendOutButton.Name = "SendOutButton"
Me.SendOutButton.Size = New System.Drawing.Size(156, 23)
Me.SendOutButton.TabIndex = 6
Me.SendOutButton.TabStop = False
Me.SendOutButton.Text = "A été livré"
Me.SendOutButton.UseVisualStyleBackColor = False
'
'TrashButton
'
Me.TrashButton.BackColor = System.Drawing.Color.Firebrick
Me.TrashButton.Enabled = False
Me.TrashButton.ForeColor = System.Drawing.Color.White
Me.TrashButton.Location = New System.Drawing.Point(361, 343)
Me.TrashButton.Name = "TrashButton"
Me.TrashButton.Size = New System.Drawing.Size(156, 23)
Me.TrashButton.TabIndex = 7
Me.TrashButton.TabStop = False
Me.TrashButton.Text = "A été jeté"
Me.TrashButton.UseVisualStyleBackColor = False
'
'Label1
'
Me.Label1.AutoSize = True
@ -297,7 +256,7 @@ Partial Class Main
Me.GroupBox2.Controls.Add(Me.Label4)
Me.GroupBox2.Controls.Add(Me.Label2)
Me.GroupBox2.Controls.Add(Me.Label1)
Me.GroupBox2.Location = New System.Drawing.Point(355, 28)
Me.GroupBox2.Location = New System.Drawing.Point(366, 169)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(508, 191)
Me.GroupBox2.TabIndex = 3
@ -342,149 +301,6 @@ Partial Class Main
Me.EtatBox.TabIndex = 13
Me.EtatBox.TabStop = False
'
'HWCheck
'
Me.HWCheck.AutoSize = True
Me.HWCheck.Enabled = False
Me.HWCheck.Location = New System.Drawing.Point(7, 20)
Me.HWCheck.Name = "HWCheck"
Me.HWCheck.Size = New System.Drawing.Size(72, 17)
Me.HWCheck.TabIndex = 0
Me.HWCheck.TabStop = False
Me.HWCheck.Text = "Hardware"
Me.HWCheck.UseVisualStyleBackColor = True
'
'OSCheck
'
Me.OSCheck.AutoSize = True
Me.OSCheck.Enabled = False
Me.OSCheck.Location = New System.Drawing.Point(7, 43)
Me.OSCheck.Name = "OSCheck"
Me.OSCheck.Size = New System.Drawing.Size(44, 17)
Me.OSCheck.TabIndex = 1
Me.OSCheck.TabStop = False
Me.OSCheck.Text = "O.S"
Me.OSCheck.UseVisualStyleBackColor = True
'
'DrvCheck
'
Me.DrvCheck.AutoSize = True
Me.DrvCheck.Enabled = False
Me.DrvCheck.Location = New System.Drawing.Point(7, 67)
Me.DrvCheck.Name = "DrvCheck"
Me.DrvCheck.Size = New System.Drawing.Size(59, 17)
Me.DrvCheck.TabIndex = 2
Me.DrvCheck.TabStop = False
Me.DrvCheck.Text = "Drivers"
Me.DrvCheck.UseVisualStyleBackColor = True
'
'SoftCheck
'
Me.SoftCheck.AutoSize = True
Me.SoftCheck.Enabled = False
Me.SoftCheck.Location = New System.Drawing.Point(151, 67)
Me.SoftCheck.Name = "SoftCheck"
Me.SoftCheck.Size = New System.Drawing.Size(68, 17)
Me.SoftCheck.TabIndex = 3
Me.SoftCheck.TabStop = False
Me.SoftCheck.Text = "Software"
Me.SoftCheck.UseVisualStyleBackColor = True
'
'ActivateCheck
'
Me.ActivateCheck.AutoSize = True
Me.ActivateCheck.Enabled = False
Me.ActivateCheck.Location = New System.Drawing.Point(72, 67)
Me.ActivateCheck.Name = "ActivateCheck"
Me.ActivateCheck.Size = New System.Drawing.Size(73, 17)
Me.ActivateCheck.TabIndex = 4
Me.ActivateCheck.TabStop = False
Me.ActivateCheck.Text = "Activation"
Me.ActivateCheck.UseVisualStyleBackColor = True
'
'ComputerRepairGlobalProgress
'
Me.ComputerRepairGlobalProgress.ForeColor = System.Drawing.Color.SteelBlue
Me.ComputerRepairGlobalProgress.Location = New System.Drawing.Point(6, 90)
Me.ComputerRepairGlobalProgress.Name = "ComputerRepairGlobalProgress"
Me.ComputerRepairGlobalProgress.Size = New System.Drawing.Size(496, 23)
Me.ComputerRepairGlobalProgress.TabIndex = 5
'
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(85, 21)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(97, 13)
Me.Label6.TabIndex = 7
Me.Label6.Text = "Proc/Architecture :"
'
'Label7
'
Me.Label7.AutoSize = True
Me.Label7.Location = New System.Drawing.Point(248, 21)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(37, 13)
Me.Label7.TabIndex = 9
Me.Label7.Text = "RAM :"
'
'MemBox
'
Me.MemBox.Location = New System.Drawing.Point(291, 17)
Me.MemBox.Name = "MemBox"
Me.MemBox.ReadOnly = True
Me.MemBox.Size = New System.Drawing.Size(57, 20)
Me.MemBox.TabIndex = 10
Me.MemBox.TabStop = False
'
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.OSBox)
Me.GroupBox3.Controls.Add(Me.ArchBox)
Me.GroupBox3.Controls.Add(Me.MemBox)
Me.GroupBox3.Controls.Add(Me.Label7)
Me.GroupBox3.Controls.Add(Me.Label6)
Me.GroupBox3.Controls.Add(Me.ComputerRepairGlobalProgress)
Me.GroupBox3.Controls.Add(Me.ActivateCheck)
Me.GroupBox3.Controls.Add(Me.SoftCheck)
Me.GroupBox3.Controls.Add(Me.DrvCheck)
Me.GroupBox3.Controls.Add(Me.OSCheck)
Me.GroupBox3.Controls.Add(Me.HWCheck)
Me.GroupBox3.Location = New System.Drawing.Point(355, 219)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(508, 118)
Me.GroupBox3.TabIndex = 4
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Avancement"
'
'OSBox
'
Me.OSBox.Location = New System.Drawing.Point(57, 41)
Me.OSBox.Name = "OSBox"
Me.OSBox.ReadOnly = True
Me.OSBox.Size = New System.Drawing.Size(59, 20)
Me.OSBox.TabIndex = 13
'
'ArchBox
'
Me.ArchBox.Location = New System.Drawing.Point(188, 18)
Me.ArchBox.Name = "ArchBox"
Me.ArchBox.ReadOnly = True
Me.ArchBox.Size = New System.Drawing.Size(54, 20)
Me.ArchBox.TabIndex = 12
'
'EditButton
'
Me.EditButton.BackColor = System.Drawing.Color.Gold
Me.EditButton.Enabled = False
Me.EditButton.Location = New System.Drawing.Point(523, 343)
Me.EditButton.Name = "EditButton"
Me.EditButton.Size = New System.Drawing.Size(172, 23)
Me.EditButton.TabIndex = 8
Me.EditButton.TabStop = False
Me.EditButton.Text = "Editer le suivi"
Me.EditButton.UseVisualStyleBackColor = False
'
'OpenBackupFile
'
Me.OpenBackupFile.DefaultExt = "sqlite"
@ -502,10 +318,6 @@ Partial Class Main
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(874, 397)
Me.Controls.Add(Me.EditButton)
Me.Controls.Add(Me.TrashButton)
Me.Controls.Add(Me.SendOutButton)
Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.GroupBox2)
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.StatusStrip1)
@ -525,8 +337,6 @@ Partial Class Main
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox3.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@ -537,8 +347,6 @@ Partial Class Main
Friend WithEvents StatusLabel As ToolStripStatusLabel
Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents InvList As ListBox
Friend WithEvents SendOutButton As Button
Friend WithEvents TrashButton As Button
Friend WithEvents AboutToolMenuItem As ToolStripMenuItem
Friend WithEvents Label1 As Label
Friend WithEvents Label2 As Label
@ -550,22 +358,9 @@ Partial Class Main
Friend WithEvents EmprunterName As TextBox
Friend WithEvents SerieCheckBox As CheckBox
Friend WithEvents GroupBox2 As GroupBox
Friend WithEvents HWCheck As CheckBox
Friend WithEvents OSCheck As CheckBox
Friend WithEvents DrvCheck As CheckBox
Friend WithEvents SoftCheck As CheckBox
Friend WithEvents ActivateCheck As CheckBox
Friend WithEvents ComputerRepairGlobalProgress As ProgressBar
Friend WithEvents Label6 As Label
Friend WithEvents Label7 As Label
Friend WithEvents MemBox As TextBox
Friend WithEvents GroupBox3 As GroupBox
Friend WithEvents EtatBox As TextBox
Friend WithEvents OSBox As TextBox
Friend WithEvents ArchBox As TextBox
Friend WithEvents GivenByBox As TextBox
Friend WithEvents Label8 As Label
Friend WithEvents EditButton As Button
Friend WithEvents IDBox As MaskedTextBox
Private WithEvents AddComputerToolMenuItem As ToolStripMenuItem
Friend WithEvents GénérerDesIDsToolStripMenuItem As ToolStripMenuItem

View File

@ -49,10 +49,8 @@ Public Class Main
cmd.CommandText = "SELECT * FROM computers_desc WHERE id=" & idToCheck & ";"
dtr = cmd.ExecuteReader()
While dtr.Read()
con.Close()
Return True
End While
con.Close()
Return False
End Using
con.Close()
@ -348,7 +346,7 @@ Public Class Main
End Try
End Sub
Private Sub TrashButton_Click(sender As Object, e As EventArgs) Handles TrashButton.Click
Private Sub TrashButton_Click(sender As Object, e As EventArgs)
If MsgBox("ATTENTION ! Voulez vous vraiment supprimer cette ordinateur de la base de données ?", 292, "Trash") = 7 Then Exit Sub
Try
@ -385,7 +383,7 @@ Public Class Main
idGeneratorForm = Nothing
End Sub
Private Sub EditButton_Click(sender As Object, e As EventArgs) Handles EditButton.Click
Private Sub EditButton_Click(sender As Object, e As EventArgs)
Dim editForm As EditSpecs
editForm = New EditSpecs(IDBox.Text, NameBox.Text, EtatBox.Text, GivenByBox.Text, SerieCheckBox.Checked, DetailsBox.Text, EmpruntCheckBox.Checked, EmprunterName.Text, HWCheck.Checked, OSCheck.Checked, DrvCheck.Checked, ActivateCheck.Checked, SoftCheck.Checked, ArchBox.Text, MemBox.Text, OSBox.Text)
editForm.ShowDialog()
@ -403,11 +401,7 @@ Public Class Main
Private Sub SaveBackupFile_FileOk(sender As Object, e As CancelEventArgs) Handles SaveBackupFile.FileOk
Using src As FileStream = File.Open(dbLocFile, FileMode.Open)
Using dest As FileStream = SaveBackupFile.OpenFile
src.CopyTo(dest)
dest.Close()
End Using
src.Close()
src.CopyTo(SaveBackupFile.OpenFile)
End Using
log.Info("DB exporté avec succès")
End Sub
@ -424,7 +418,6 @@ Public Class Main
Using dest As FileStream = File.Open(dbLocFile, FileMode.Create)
OpenBackupFile.OpenFile.CopyTo(dest)
dest.Close()
End Using
ListAllInv()
log.Info("DB importé avec succès")

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' en utilisant '*', comme indiqué ci-dessous :
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("0.11.3.0")>
<Assembly: AssemblyFileVersion("0.11.3.0")>
<Assembly: AssemblyVersion("0.11.2.3")>
<Assembly: AssemblyFileVersion("0.11.2.3")>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Data.SQLite.Core" version="1.0.108.0" targetFramework="net452" />
<package id="System.Data.SQLite.Core" version="1.0.105.2" targetFramework="net452" />
</packages>

View File

@ -21,8 +21,8 @@
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user" />
Exists('$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
@ -132,8 +132,7 @@
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0' Or
'$(VisualStudioVersion)' == '15.0'">
'$(VisualStudioVersion)' == '14.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);

View File

@ -21,8 +21,8 @@
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user" />
Exists('$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
@ -132,8 +132,7 @@
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0' Or
'$(VisualStudioVersion)' == '15.0'">
'$(VisualStudioVersion)' == '14.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);

View File

@ -21,8 +21,8 @@
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user" />
Exists('$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
@ -132,8 +132,7 @@
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0' Or
'$(VisualStudioVersion)' == '15.0'">
'$(VisualStudioVersion)' == '14.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);

View File

@ -21,8 +21,8 @@
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user" />
Exists('$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
@ -132,8 +132,7 @@
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0' Or
'$(VisualStudioVersion)' == '15.0'">
'$(VisualStudioVersion)' == '14.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);

View File

@ -0,0 +1,141 @@
<!--
*
* System.Data.SQLite.Core.targets -
*
* WARNING: This MSBuild file requires MSBuild 4.0 features.
*
* Written by Joe Mistachkin and David Archer.
* Released to the public domain, use at your own risk!
*
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** Load Per-User Settings **
******************************************************************************
-->
<!--
NOTE: If the per-user settings file exists, import it now. The contained
settings, if any, will override the default ones provided below.
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)\System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
** SQLite Interop Library Build Items **
******************************************************************************
-->
<ItemGroup>
<SQLiteInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)')"
Include="$(MSBuildThisFileDirectory)**\SQLite.Interop.*" />
</ItemGroup>
<!--
******************************************************************************
** SQLite Interop Library Content Items **
******************************************************************************
-->
<ItemGroup Condition="'$(ContentSQLiteInteropFiles)' != '' And
'$(ContentSQLiteInteropFiles)' != 'false' And
'@(SQLiteInteropFiles)' != ''">
<Content Include="@(SQLiteInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<!--
******************************************************************************
** SQLite Interop Library Build Targets **
******************************************************************************
-->
<Target Name="CopySQLiteInteropFiles"
Condition="'$(CopySQLiteInteropFiles)' != 'false' And
'$(OutDir)' != '' And
HasTrailingSlash('$(OutDir)') And
Exists('$(OutDir)')"
Inputs="@(SQLiteInteropFiles)"
Outputs="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')">
<!--
NOTE: Copy "SQLite.Interop.dll" and all related files, for every
architecture that we support, to the build output directory.
-->
<Copy SourceFiles="@(SQLiteInteropFiles)"
DestinationFiles="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<!--
******************************************************************************
-->
<Target Name="CleanSQLiteInteropFiles"
Condition="'$(CleanSQLiteInteropFiles)' != 'false' And
'$(OutDir)' != '' And
HasTrailingSlash('$(OutDir)') And
Exists('$(OutDir)')">
<!--
NOTE: Delete "SQLite.Interop.dll" and all related files, for every
architecture that we support, from the build output directory.
-->
<Delete Files="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<!--
******************************************************************************
-->
<Target Name="CollectSQLiteInteropFiles"
Condition="'$(CollectSQLiteInteropFiles)' != 'false'">
<ItemGroup>
<FilesForPackagingFromProject Include="@(SQLiteInteropFiles)">
<DestinationRelativePath>bin\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
<!--
******************************************************************************
** SQLite Interop Library Build Properties **
******************************************************************************
-->
<PropertyGroup>
<PostBuildEventDependsOn>
$(PostBuildEventDependsOn);
CopySQLiteInteropFiles;
</PostBuildEventDependsOn>
<BuildDependsOn>
$(BuildDependsOn);
CopySQLiteInteropFiles;
</BuildDependsOn>
<CleanDependsOn>
$(CleanDependsOn);
CleanSQLiteInteropFiles;
</CleanDependsOn>
</PropertyGroup>
<!--
******************************************************************************
** SQLite Interop Library Publish Properties for Visual Studio 201x **
******************************************************************************
-->
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' Or
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);
</PipelineCollectFilesPhaseDependsOn>
</PropertyGroup>
</Project>

View File

@ -1,142 +0,0 @@
<!--
*
* System.Data.SQLite.Core.targets -
*
* WARNING: This MSBuild file requires MSBuild 4.0 features.
*
* Written by Joe Mistachkin and David Archer.
* Released to the public domain, use at your own risk!
*
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** Load Per-User Settings **
******************************************************************************
-->
<!--
NOTE: If the per-user settings file exists, import it now. The contained
settings, if any, will override the default ones provided below.
-->
<Import Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)') And
Exists('$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user')"
Project="$(MSBuildThisFileDirectory)System.Data.SQLite.Core.targets.user" />
<!--
******************************************************************************
** SQLite Interop Library Build Items **
******************************************************************************
-->
<ItemGroup>
<SQLiteInteropFiles Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)')"
Include="$(MSBuildThisFileDirectory)**\SQLite.Interop.*" />
</ItemGroup>
<!--
******************************************************************************
** SQLite Interop Library Content Items **
******************************************************************************
-->
<ItemGroup Condition="'$(ContentSQLiteInteropFiles)' != '' And
'$(ContentSQLiteInteropFiles)' != 'false' And
'@(SQLiteInteropFiles)' != ''">
<Content Include="@(SQLiteInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<!--
******************************************************************************
** SQLite Interop Library Build Targets **
******************************************************************************
-->
<Target Name="CopySQLiteInteropFiles"
Condition="'$(CopySQLiteInteropFiles)' != 'false' And
'$(OutDir)' != '' And
HasTrailingSlash('$(OutDir)') And
Exists('$(OutDir)')"
Inputs="@(SQLiteInteropFiles)"
Outputs="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')">
<!--
NOTE: Copy "SQLite.Interop.dll" and all related files, for every
architecture that we support, to the build output directory.
-->
<Copy SourceFiles="@(SQLiteInteropFiles)"
DestinationFiles="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<!--
******************************************************************************
-->
<Target Name="CleanSQLiteInteropFiles"
Condition="'$(CleanSQLiteInteropFiles)' != 'false' And
'$(OutDir)' != '' And
HasTrailingSlash('$(OutDir)') And
Exists('$(OutDir)')">
<!--
NOTE: Delete "SQLite.Interop.dll" and all related files, for every
architecture that we support, from the build output directory.
-->
<Delete Files="@(SQLiteInteropFiles -> '$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<!--
******************************************************************************
-->
<Target Name="CollectSQLiteInteropFiles"
Condition="'$(CollectSQLiteInteropFiles)' != 'false'">
<ItemGroup>
<FilesForPackagingFromProject Include="@(SQLiteInteropFiles)">
<DestinationRelativePath>bin\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
<!--
******************************************************************************
** SQLite Interop Library Build Properties **
******************************************************************************
-->
<PropertyGroup>
<PostBuildEventDependsOn>
$(PostBuildEventDependsOn);
CopySQLiteInteropFiles;
</PostBuildEventDependsOn>
<BuildDependsOn>
$(BuildDependsOn);
CopySQLiteInteropFiles;
</BuildDependsOn>
<CleanDependsOn>
$(CleanDependsOn);
CleanSQLiteInteropFiles;
</CleanDependsOn>
</PropertyGroup>
<!--
******************************************************************************
** SQLite Interop Library Publish Properties for Visual Studio 201x **
******************************************************************************
-->
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' Or
'$(VisualStudioVersion)' == '10.0' Or
'$(VisualStudioVersion)' == '11.0' Or
'$(VisualStudioVersion)' == '12.0' Or
'$(VisualStudioVersion)' == '14.0' Or
'$(VisualStudioVersion)' == '15.0'">
<PipelineCollectFilesPhaseDependsOn>
CollectSQLiteInteropFiles;
$(PipelineCollectFilesPhaseDependsOn);
</PipelineCollectFilesPhaseDependsOn>
</PropertyGroup>
</Project>