Skip to content

Commit 643a899

Browse files
author
Dominic Beger
committed
Upgrade projects to newer versions and improve the structure. Fixes #94 
1 parent c97cac6 commit 643a899

379 files changed

Lines changed: 3269 additions & 6837 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MigrationBackup/1fccbbc3/nUpdate.UI.WPF/NuGetUpgradeLog.html‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<!DOCTYPE html>
2+
<!-- saved from url=(0014)about:internet -->
3+
4+
<html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
5+
NuGetMigrationLog
6+
</title><style>
7+
8+
/* Body style, for the entire document */
9+
body
10+
{
11+
background: #F3F3F4;
12+
color: #1E1E1F;
13+
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
14+
font-size: 12pt;
15+
padding: 0;
16+
margin: 0;
17+
}
18+
19+
/* Header1 style, used for the main title */
20+
h1
21+
{
22+
padding: 10px 0px 10px 10px;
23+
font-size: 21pt;
24+
background-color: #E2E2E2;
25+
border-bottom: 1px #C1C1C2 solid;
26+
color: #201F20;
27+
margin: 0;
28+
font-weight: normal;
29+
}
30+
31+
/* Header2 style, used for "Overview" and other sections */
32+
h2
33+
{
34+
font-size: 18pt;
35+
font-weight: normal;
36+
padding: 15px 0 5px 0;
37+
margin: 0;
38+
}
39+
40+
/* Header3 style, used for sub-sections, such as project name */
41+
h3
42+
{
43+
font-weight: normal;
44+
font-size: 15pt;
45+
margin: 0;
46+
padding: 15px 0 5px 0;
47+
background-color: transparent;
48+
}
49+
50+
.info-text
51+
{
52+
margin: 0px 0 0.75em 0;
53+
}
54+
55+
/* Color all hyperlinks one color */
56+
a
57+
{
58+
color: #1382CE;
59+
}
60+
61+
/* Table styles */
62+
table
63+
{
64+
border-spacing: 0 0;
65+
border-collapse: collapse;
66+
font-size: 11pt;
67+
}
68+
69+
table th
70+
{
71+
background: #E7E7E8;
72+
text-align: left;
73+
text-decoration: none;
74+
font-weight: normal;
75+
padding: 3px 6px 3px 6px;
76+
}
77+
78+
table td
79+
{
80+
vertical-align: top;
81+
padding: 3px 6px 5px 5px;
82+
margin: 0px;
83+
border: 1px solid #E7E7E8;
84+
background: #F7F7F8;
85+
}
86+
87+
/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
88+
.localLink
89+
{
90+
color: #1E1E1F;
91+
background: #EEEEED;
92+
text-decoration: none;
93+
}
94+
95+
.localLink:hover
96+
{
97+
color: #1382CE;
98+
background: #FFFF99;
99+
text-decoration: none;
100+
}
101+
102+
.issueCell
103+
{
104+
width: 100%;
105+
}
106+
107+
.packageIssue
108+
{
109+
margin-left: 25px;
110+
}
111+
112+
/* Padding around the content after the h1 */
113+
#content
114+
{
115+
padding: 0px 20px 20px 20px;
116+
}
117+
118+
.issues table
119+
{
120+
width: 97%;
121+
}
122+
123+
/* All Icons */
124+
.IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
125+
{
126+
min-width:18px;
127+
min-height:18px;
128+
background-repeat:no-repeat;
129+
background-position:center;
130+
}
131+
132+
.IconSuccessEncoded
133+
{
134+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
135+
}
136+
137+
.IconInfoEncoded
138+
{
139+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
140+
}
141+
142+
.IconWarningEncoded
143+
{
144+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
145+
}
146+
147+
.IconErrorEncoded
148+
{
149+
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
150+
}
151+
152+
</style></head><body><h1>
153+
NuGet Migration Report - nUpdate.UI.WPF</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
154+
If you run into any problems, have feedback, questions, or concerns, please
155+
<a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
156+
Changed files and this report have been backed up here:
157+
<a href="C:\Users\Dominic\source\repos\nUpdate\MigrationBackup\1fccbbc3\nUpdate.UI.WPF">C:\Users\Dominic\source\repos\nUpdate\MigrationBackup\1fccbbc3\nUpdate.UI.WPF</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>Newtonsoft.Json</span></td><td><span>
158+
v13.0.1</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell">
159+
No transitive dependencies found.
160+
</td><td /></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
161+
No issues were found.
162+
</td></tr></table></div></div></body></html>

nUpdate.WPFUserInterface/nUpdate.WPFUserInterface.csproj renamed to MigrationBackup/1fccbbc3/nUpdate.UI.WPF/nUpdate.UI.WPF.csproj

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{EF0AA5C9-FFEF-440D-975A-4E78C3BBBA17}</ProjectGuid>
88
<OutputType>Library</OutputType>
9-
<RootNamespace>nUpdate</RootNamespace>
10-
<AssemblyName>nUpdate.WPFUserInterface</AssemblyName>
11-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
9+
<RootNamespace>nUpdate.UI.WPF</RootNamespace>
10+
<AssemblyName>nUpdate.UI.WPF</AssemblyName>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -40,6 +41,9 @@
4041
<ApplicationIcon>Trade-Updater-Logo-v3.ico</ApplicationIcon>
4142
</PropertyGroup>
4243
<ItemGroup>
44+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
46+
</Reference>
4347
<Reference Include="System" />
4448
<Reference Include="System.Data" />
4549
<Reference Include="System.Drawing" />
@@ -58,10 +62,13 @@
5862
<Reference Include="PresentationFramework" />
5963
</ItemGroup>
6064
<ItemGroup>
65+
<Compile Include="SizeHelper.cs" />
66+
<Compile Include="Win32\NativeMethods.cs" />
6167
<Page Include="App.xaml">
6268
<Generator>MSBuild:Compile</Generator>
6369
<SubType>Designer</SubType>
6470
</Page>
71+
<Compile Include="IconHelper.cs" />
6572
<Compile Include="ServiceInterfaces\IDialogWindowService.cs" />
6673
<Compile Include="ServiceInterfaces\IMessageboxService.cs" />
6774
<Compile Include="ServiceInterfaces\ServiceContainer.cs" />
@@ -77,8 +84,6 @@
7784
<Compile Include="UI\Windows\DialogWindow.xaml.cs">
7885
<DependentUpon>DialogWindow.xaml</DependentUpon>
7986
</Compile>
80-
<Compile Include="UpdateConfiguration.cs" />
81-
<Compile Include="UpdateManager.cs" />
8287
<Compile Include="UpdaterUI.cs" />
8388
<Compile Include="ViewModel\ChangelogViewModel.cs" />
8489
<Compile Include="Extensions.cs" />
@@ -131,6 +136,7 @@
131136
<Generator>ResXFileCodeGenerator</Generator>
132137
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
133138
</EmbeddedResource>
139+
<None Include="packages.config" />
134140
<None Include="Properties\Settings.settings">
135141
<Generator>SettingsSingleFileGenerator</Generator>
136142
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -140,18 +146,17 @@
140146
<None Include="App.config" />
141147
</ItemGroup>
142148
<ItemGroup>
143-
<ProjectReference Include="..\nUpdate.Client.GuiInterface\nUpdate.UpdateInstaller.Client.GuiInterface.csproj">
149+
<ProjectReference Include="..\nUpdate.UpdateInstaller.UIBase\nUpdate.UpdateInstaller.UIBase.csproj">
144150
<Project>{5E63208A-8F06-4B99-A41D-F469BE4CFD00}</Project>
145151
<Name>nUpdate.UpdateInstaller.Client.GuiInterface</Name>
146152
</ProjectReference>
147-
<ProjectReference Include="..\nUpdate.Internal\nUpdate.Internal.csproj">
148-
<Project>{efb71d69-ebf9-4f60-b776-de443730a3dd}</Project>
149-
<Name>nUpdate.Internal</Name>
153+
<ProjectReference Include="..\nUpdate\nUpdate.csproj">
154+
<Project>{1f5cbe95-f969-45bb-a385-2fd1a3a5ac32}</Project>
155+
<Name>nUpdate</Name>
150156
</ProjectReference>
151157
</ItemGroup>
152158
<ItemGroup>
153159
<Resource Include="Trade-Updater-Logo-v3.ico" />
154160
</ItemGroup>
155-
<Import Project="..\nUpdate.Shared\nUpdate.Shared.projitems" Label="Shared" />
156161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
157162
</Project>

‎MigrationBackup/1fccbbc3/nUpdate.UI.WPF/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
4+
</packages>

0 commit comments

Comments
 (0)