Skip to content

Commit d7868f7

Browse files
Josch62Josch62
committedFeb 21, 2021
Fixed references and build order.
1 parent 1293b73 commit d7868f7

17 files changed

+129
-69
lines changed
 

‎CccmExtension.sln

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2525
ProjectSection(SolutionItems) = preProject
2626
.Build\ApplyVersionToAssemblies.ps1 = .Build\ApplyVersionToAssemblies.ps1
2727
Onevinn_recommended.ruleset = Onevinn_recommended.ruleset
28+
README.md = README.md
2829
EndProjectSection
2930
EndProject
3031
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchedulerSettings", "SchedulerSettings\SchedulerSettings.csproj", "{6567D895-51B8-40CD-B0D1-2B3BCCDBE3C6}"

‎ConfigurationEditor/ConfigurationEditor.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28-
<CodeAnalysisRuleSet />
28+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2929
</PropertyGroup>
3030
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3131
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -71,9 +71,6 @@
7171
<Reference Include="Microsoft.EnterpriseManagement.UI.WpfViews">
7272
<HintPath>..\References\Microsoft.EnterpriseManagement.UI.WpfViews.dll</HintPath>
7373
</Reference>
74-
<Reference Include="SchedulerSettings">
75-
<HintPath>..\SchedulerSettings\bin\Release\SchedulerSettings.dll</HintPath>
76-
</Reference>
7774
<Reference Include="System" />
7875
<Reference Include="System.Data" />
7976
<Reference Include="System.Drawing" />
@@ -176,6 +173,12 @@
176173
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
177174
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
178175
</ItemGroup>
176+
<ItemGroup>
177+
<ProjectReference Include="..\SchedulerSettings\SchedulerSettings.csproj">
178+
<Project>{6567d895-51b8-40cd-b0d1-2b3bccdbe3c6}</Project>
179+
<Name>SchedulerSettings</Name>
180+
</ProjectReference>
181+
</ItemGroup>
179182
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
180183
<PropertyGroup>
181184
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>

‎CustomActions/CustomActions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25-
<CodeAnalysisRuleSet />
25+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2828
<DebugType>pdbonly</DebugType>

‎DeploymentScheduler/DeploymentScheduler.csproj

+20-11
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28-
<RunCodeAnalysis>true</RunCodeAnalysis>
29-
<CodeAnalysisRuleSet>
30-
</CodeAnalysisRuleSet>
28+
<RunCodeAnalysis>false</RunCodeAnalysis>
29+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
3130
</PropertyGroup>
3231
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3332
<PlatformTarget>x64</PlatformTarget>
@@ -42,18 +41,11 @@
4241
</PropertyGroup>
4342
<ItemGroup>
4443
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\SchedulerCommon\bin\Release\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
44+
<HintPath>..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
4745
</Reference>
4846
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4947
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5048
</Reference>
51-
<Reference Include="SchedulerCommon">
52-
<HintPath>..\SchedulerCommon\bin\Release\SchedulerCommon.dll</HintPath>
53-
</Reference>
54-
<Reference Include="SchedulerSettings">
55-
<HintPath>..\SchedulerSettings\bin\Release\SchedulerSettings.dll</HintPath>
56-
</Reference>
5749
<Reference Include="System" />
5850
<Reference Include="System.Core" />
5951
<Reference Include="System.Security" />
@@ -87,6 +79,16 @@
8779
<ItemGroup>
8880
<AdditionalFiles Include="stylecop.json" />
8981
</ItemGroup>
82+
<ItemGroup>
83+
<ProjectReference Include="..\SchedulerCommon\SchedulerCommon.csproj">
84+
<Project>{26256f38-5a47-4c03-ad53-6b0813ce74fd}</Project>
85+
<Name>SchedulerCommon</Name>
86+
</ProjectReference>
87+
<ProjectReference Include="..\SchedulerSettings\SchedulerSettings.csproj">
88+
<Project>{6567d895-51b8-40cd-b0d1-2b3bccdbe3c6}</Project>
89+
<Name>SchedulerSettings</Name>
90+
</ProjectReference>
91+
</ItemGroup>
9092
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9193
<PropertyGroup>
9294
<PostBuildEvent>
@@ -105,4 +107,11 @@
105107
<Target Name="AfterBuild" Condition="'$(SignAssembly)' == 'true'">
106108
<CallTarget Targets="SignFiles" />
107109
</Target>
110+
<Import Project="..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
111+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
112+
<PropertyGroup>
113+
<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>
114+
</PropertyGroup>
115+
<Error Condition="!Exists('..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets'))" />
116+
</Target>
108117
</Project>

‎DeploymentScheduler/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net472" />
4+
<package id="Microsoft.Diagnostics.Tracing.EventSource" version="1.1.28" targetFramework="net472" />
5+
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net472" />
36
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
47
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
58
</packages>

‎Installer.ConfigurationEditor/Installer.ConfigurationEditor.wixproj

+19-18
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66
<ProductVersion>3.10</ProductVersion>
77
<ProjectGuid>1a7f5666-0412-4bdb-a186-51b3e5c0b148</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(TF_BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
10-
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
11-
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">0.0.1</MSIProductVersion>
12-
<OutputName>ConfigurationEditor $(MSIProductVersion)</OutputName>
9+
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(TF_BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
10+
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">$([System.Text.RegularExpressions.Regex]::Match($(BUILD_BUILDNUMBER), "\d+.\d+.\d+.\d+"))</MSIProductVersion>
11+
<MSIProductVersion Condition=" '$(MSIProductVersion)' == '' ">0.0.1</MSIProductVersion>
12+
<OutputName>ConfigurationEditor $(MSIProductVersion)</OutputName>
1313
<OutputType>Package</OutputType>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1616
<OutputPath>bin\$(Configuration)\</OutputPath>
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
18-
<DefineConstants>Debug</DefineConstants>
18+
<DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>
19+
<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2122
<OutputPath>bin\$(Configuration)\</OutputPath>
@@ -71,19 +72,19 @@
7172
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
7273
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
7374
</Target>
74-
<PropertyGroup>
75-
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
76-
<WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot81', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
77-
<WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
78-
<SignToolPath Condition=" '$(SignToolPath)' == '' And '$(Platform)' == 'AnyCPU' ">$(WindowsKitsRoot)bin\x86\</SignToolPath>
79-
<SignToolPath Condition="'$(SignToolPath)' == ''">$(WindowsKitsRoot)bin\$(Platform)\</SignToolPath>
80-
</PropertyGroup>
81-
<Target Name="SignFile">
82-
<Exec Command="&quot;$(SignToolPath)signtool.exe&quot; sign /f &quot;$(SigningCertificate)&quot; /p &quot;$(SigningPassword)&quot; /fd SHA256 /tr &quot;http://timestamp.digicert.com&quot; /td SHA256 &quot;$(TargetPath)&quot;" />
83-
</Target>
84-
<Target Name="AfterBuild">
85-
<CallTarget Targets="SignFile" Condition="'$(SignAssembly)' == 'true'" />
86-
</Target>
75+
<PropertyGroup>
76+
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
77+
<WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot81', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
78+
<WindowsKitsRoot Condition="'$(WindowsKitsRoot)' == ''">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
79+
<SignToolPath Condition=" '$(SignToolPath)' == '' And '$(Platform)' == 'AnyCPU' ">$(WindowsKitsRoot)bin\x86\</SignToolPath>
80+
<SignToolPath Condition="'$(SignToolPath)' == ''">$(WindowsKitsRoot)bin\$(Platform)\</SignToolPath>
81+
</PropertyGroup>
82+
<Target Name="SignFile">
83+
<Exec Command="&quot;$(SignToolPath)signtool.exe&quot; sign /f &quot;$(SigningCertificate)&quot; /p &quot;$(SigningPassword)&quot; /fd SHA256 /tr &quot;http://timestamp.digicert.com&quot; /td SHA256 &quot;$(TargetPath)&quot;" />
84+
</Target>
85+
<Target Name="AfterBuild">
86+
<CallTarget Targets="SignFile" Condition="'$(SignAssembly)' == 'true'" />
87+
</Target>
8788
<!--
8889
To modify your build process, add your task inside one of the targets below and uncomment it.
8990
Other similar extension points exist, see Wix.targets.

‎Installer.DeploymentScheduler/Installer.DeploymentScheduler.wixproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1616
<OutputPath>bin\$(Configuration)\</OutputPath>
1717
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
18-
<DefineConstants>Debug</DefineConstants>
18+
<DefineConstants>Debug;MSIProductVersion=$(MSIProductVersion)</DefineConstants>
19+
<WixVariables>WixUIBannerBmp=Resources\Banner.jpg;WixUIDialogBmp=Resources\Dialog.jpg;WixUILicenseRtf=Resources\EULA.rtf</WixVariables>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2122
<OutputPath>bin\$(Configuration)\</OutputPath>

‎IpuProgress/IpuProgress.csproj

+28-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@
1414
<WarningLevel>4</WarningLevel>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1616
<TargetFrameworkProfile />
17+
<PublishUrl>publish\</PublishUrl>
18+
<Install>true</Install>
19+
<InstallFrom>Disk</InstallFrom>
20+
<UpdateEnabled>false</UpdateEnabled>
21+
<UpdateMode>Foreground</UpdateMode>
22+
<UpdateInterval>7</UpdateInterval>
23+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
24+
<UpdatePeriodically>false</UpdatePeriodically>
25+
<UpdateRequired>false</UpdateRequired>
26+
<MapFileExtensions>true</MapFileExtensions>
27+
<ApplicationRevision>0</ApplicationRevision>
28+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
29+
<IsWebBootstrapper>false</IsWebBootstrapper>
30+
<UseApplicationTrust>false</UseApplicationTrust>
31+
<BootstrapperEnabled>true</BootstrapperEnabled>
1732
</PropertyGroup>
1833
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1934
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -24,7 +39,7 @@
2439
<DefineConstants>DEBUG;TRACE</DefineConstants>
2540
<ErrorReport>prompt</ErrorReport>
2641
<WarningLevel>4</WarningLevel>
27-
<CodeAnalysisRuleSet />
42+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2843
</PropertyGroup>
2944
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3045
<PlatformTarget>x64</PlatformTarget>
@@ -111,6 +126,18 @@
111126
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
112127
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
113128
</ItemGroup>
129+
<ItemGroup>
130+
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
131+
<Visible>False</Visible>
132+
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
133+
<Install>true</Install>
134+
</BootstrapperPackage>
135+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
136+
<Visible>False</Visible>
137+
<ProductName>.NET Framework 3.5 SP1</ProductName>
138+
<Install>false</Install>
139+
</BootstrapperPackage>
140+
</ItemGroup>
114141
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
115142
<PropertyGroup>
116143
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>

‎OneControls/OneControls.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26-
<CodeAnalysisRuleSet />
26+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2929
<DebugType>pdbonly</DebugType>

‎OnevinnTrayIcon/OnevinnTrayIcon.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27-
<CodeAnalysisRuleSet />
27+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3030
<PlatformTarget>x64</PlatformTarget>
@@ -127,12 +127,6 @@
127127
<ItemGroup>
128128
<None Include="App.config" />
129129
</ItemGroup>
130-
<ItemGroup>
131-
<ProjectReference Include="..\SchedulerCommon\SchedulerCommon.csproj">
132-
<Project>{26256f38-5a47-4c03-ad53-6b0813ce74fd}</Project>
133-
<Name>SchedulerCommon</Name>
134-
</ProjectReference>
135-
</ItemGroup>
136130
<ItemGroup>
137131
<Resource Include="Icons\product.ico" />
138132
<Resource Include="Icons\Warning.ico" />
@@ -144,6 +138,12 @@
144138
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
145139
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
146140
</ItemGroup>
141+
<ItemGroup>
142+
<ProjectReference Include="..\SchedulerCommon\SchedulerCommon.csproj">
143+
<Project>{26256f38-5a47-4c03-ad53-6b0813ce74fd}</Project>
144+
<Name>SchedulerCommon</Name>
145+
</ProjectReference>
146+
</ItemGroup>
147147
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
148148
<PropertyGroup>
149149
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>

‎README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# DeploymentScheduler for MEMCM
1+
# DeploymentScheduler for MEMCM
22
##### Application that enables the end user to freely schedule Application and updates installation.
33
##### Clone or Download.
44
##### Needs Wix Installer VS plug-in and Wix Tools.
5-
##### Restore Nugent packages on Solution level.
6-
##### Might not build in Debug mode, use Release.
5+
##### Restore Nugent packages on Solution level.

‎SchedulerCommon/SchedulerCommon.csproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28-
<RunCodeAnalysis>true</RunCodeAnalysis>
29-
<CodeAnalysisRuleSet>
30-
</CodeAnalysisRuleSet>
28+
<RunCodeAnalysis>false</RunCodeAnalysis>
29+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
3130
</PropertyGroup>
3231
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3332
<DebugType>pdbonly</DebugType>
@@ -58,9 +57,6 @@
5857
<Reference Include="QueryString.NETCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5958
<HintPath>..\packages\QueryString.NET.1.0.0\lib\dotnet\QueryString.NETCore.dll</HintPath>
6059
</Reference>
61-
<Reference Include="SchedulerSettings">
62-
<HintPath>..\SchedulerSettings\bin\Release\SchedulerSettings.dll</HintPath>
63-
</Reference>
6460
<Reference Include="System" />
6561
<Reference Include="System.Core" />
6662
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
@@ -198,6 +194,12 @@
198194
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
199195
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
200196
</ItemGroup>
197+
<ItemGroup>
198+
<ProjectReference Include="..\SchedulerSettings\SchedulerSettings.csproj">
199+
<Project>{6567d895-51b8-40cd-b0d1-2b3bccdbe3c6}</Project>
200+
<Name>SchedulerSettings</Name>
201+
</ProjectReference>
202+
</ItemGroup>
201203
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
202204
<PropertyGroup>
203205
<PostBuildEvent>

‎SchedulerSettings/SchedulerSettings.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24-
<CodeAnalysisRuleSet />
24+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2727
<DebugType>pdbonly</DebugType>

‎UserScheduler/UserScheduler.csproj

+26-15
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
<DefineConstants>DEBUG;TRACE</DefineConstants>
2929
<ErrorReport>prompt</ErrorReport>
3030
<WarningLevel>4</WarningLevel>
31-
<RunCodeAnalysis>true</RunCodeAnalysis>
32-
<CodeAnalysisRuleSet>
33-
</CodeAnalysisRuleSet>
31+
<RunCodeAnalysis>false</RunCodeAnalysis>
32+
<CodeAnalysisRuleSet>..\Onevinn_recommended.ruleset</CodeAnalysisRuleSet>
3433
</PropertyGroup>
3534
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3635
<PlatformTarget>x64</PlatformTarget>
@@ -53,28 +52,17 @@
5352
<HintPath>..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
5453
</Reference>
5554
<Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\SchedulerCommon\bin\Release\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
55+
<HintPath>..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
5856
</Reference>
5957
<Reference Include="Microsoft.Toolkit.Uwp.Notifications, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6058
<HintPath>..\packages\Microsoft.Toolkit.Uwp.Notifications.2.0.0\lib\dotnet\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
6159
</Reference>
6260
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6361
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6462
</Reference>
65-
<Reference Include="OneControls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\OneControls\bin\Release\OneControls.dll</HintPath>
68-
</Reference>
6963
<Reference Include="QueryString.NETCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7064
<HintPath>..\packages\QueryString.NET.1.0.0\lib\dotnet\QueryString.NETCore.dll</HintPath>
7165
</Reference>
72-
<Reference Include="SchedulerCommon">
73-
<HintPath>..\SchedulerCommon\bin\Release\SchedulerCommon.dll</HintPath>
74-
</Reference>
75-
<Reference Include="SchedulerSettings">
76-
<HintPath>..\SchedulerSettings\bin\Release\SchedulerSettings.dll</HintPath>
77-
</Reference>
7866
<Reference Include="System" />
7967
<Reference Include="System.ComponentModel.Composition" />
8068
<Reference Include="System.IO.Compression.FileSystem" />
@@ -242,6 +230,8 @@
242230
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
243231
</None>
244232
<AdditionalFiles Include="stylecop.json" />
233+
<None Include="_EventRegisterUsersGuide.docx" />
234+
<None Include="_EventSourceUsersGuide.docx" />
245235
</ItemGroup>
246236
<ItemGroup>
247237
<None Include="App.config" />
@@ -279,6 +269,20 @@
279269
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
280270
<Analyzer Include="..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
281271
</ItemGroup>
272+
<ItemGroup>
273+
<ProjectReference Include="..\OneControls\OneControls.csproj">
274+
<Project>{5d2632a9-c2ca-47a7-9dac-124c2b0720ad}</Project>
275+
<Name>OneControls</Name>
276+
</ProjectReference>
277+
<ProjectReference Include="..\SchedulerCommon\SchedulerCommon.csproj">
278+
<Project>{26256f38-5a47-4c03-ad53-6b0813ce74fd}</Project>
279+
<Name>SchedulerCommon</Name>
280+
</ProjectReference>
281+
<ProjectReference Include="..\SchedulerSettings\SchedulerSettings.csproj">
282+
<Project>{6567d895-51b8-40cd-b0d1-2b3bccdbe3c6}</Project>
283+
<Name>SchedulerSettings</Name>
284+
</ProjectReference>
285+
</ItemGroup>
282286
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
283287
<PropertyGroup>
284288
<WindowsKitsRoot>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WindowsKitsRoot>
@@ -293,4 +297,11 @@
293297
<Target Name="AfterBuild" Condition="'$(SignAssembly)' == 'true'">
294298
<CallTarget Targets="SignFiles" />
295299
</Target>
300+
<Import Project="..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets" Condition="Exists('..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" />
301+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
302+
<PropertyGroup>
303+
<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>
304+
</PropertyGroup>
305+
<Error Condition="!Exists('..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Diagnostics.Tracing.EventRegister.1.1.28\build\Microsoft.Diagnostics.Tracing.EventRegister.targets'))" />
306+
</Target>
296307
</Project>

‎UserScheduler/_EventRegisterUsersGuide.docx

110 KB
Binary file not shown.

‎UserScheduler/_EventSourceUsersGuide.docx

159 KB
Binary file not shown.

‎UserScheduler/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net462" />
4+
<package id="Microsoft.Diagnostics.Tracing.EventRegister" version="1.1.28" targetFramework="net472" />
5+
<package id="Microsoft.Diagnostics.Tracing.EventSource" version="1.1.28" targetFramework="net472" />
6+
<package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net472" />
47
<package id="Microsoft.Toolkit.Uwp.Notifications" version="2.0.0" targetFramework="net462" />
58
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
69
<package id="QueryString.NET" version="1.0.0" targetFramework="net462" />

0 commit comments

Comments
 (0)
Please sign in to comment.