Skip to content

Commit

Permalink
Enabled SourceLink.
Browse files Browse the repository at this point in the history
  • Loading branch information
GregaMohorko committed Jun 29, 2020
1 parent 1cb170d commit 163a5e2
Show file tree
Hide file tree
Showing 21 changed files with 166 additions and 170 deletions.
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright 2020 Gregor Mohorko

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ protected override void OnStartup(StartupEventArgs e)
```

## Requirements
.NET Framework 4.6.1
.NET Framework 4.7.1

## Author and License
Grega Mohorko ([www.mohorko.info](https://www.mohorko.info))
Gregor Mohorko ([www.mohorko.info](https://www.mohorko.info))

Copyright (c) 2018 Grega Mohorko
Copyright (c) 2020 Gregor Mohorko

[Apache License 2.0](./LICENSE)
[Apache License 2.0](./LICENSE.md)
1 change: 1 addition & 0 deletions src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ publish/

# NuGet Packages
*.nupkg
*.snupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
Expand Down
6 changes: 3 additions & 3 deletions src/BlueUpdate/BlueUpdate Updater/App.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
MIT License
Expand Down Expand Up @@ -28,6 +28,6 @@ Author: GregaMohorko
-->
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
</configuration>
8 changes: 4 additions & 4 deletions src/BlueUpdate/BlueUpdate Updater/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
MIT License
Copyright (c) 2018 Grega Mohorko
Copyright (c) 2020 Gregor Mohorko
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
Project: BlueUpdate Updater
Created: 2017-10-29
Author: GregaMohorko
Author: Gregor Mohorko
*/

using System;
Expand Down Expand Up @@ -55,13 +55,13 @@ protected override void OnStartup(StartupEventArgs e)

UpdatableApp appToUpdate;
UpdaterBehavior updaterBehavior=UpdaterBehavior.SHOW_MESSAGES;
ICredentials credentials = null;
ICredentials credentials;
string arguments = null;

try {
// set the current application as the updater
var assembly = ReflectionUtility.GetAssemblyInformation(ReflectionUtility.GetAssembly(ReflectionUtility.AssemblyType.APPLICATION));
UpdatableApp.Current = new UpdatableApp(BlueUpdateConstants.UpdaterName, assembly.Version, null, null, BlueUpdateConstants.UpdaterDirectoryName);
UpdatableApp.Current = new UpdatableApp(BlueUpdateConstants.UPDATER_NAME, assembly.Version, null, null, BlueUpdateConstants.UPDATER_DIRECTORY_NAME);

// check arguments
if(e.Args.Length < 9 || e.Args.Length > 10) {
Expand Down
7 changes: 4 additions & 3 deletions src/BlueUpdate/BlueUpdate Updater/BlueUpdate Updater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BlueUpdate_Updater</RootNamespace>
<AssemblyName>BlueUpdate Updater</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -47,8 +48,8 @@
<AssemblyOriginatorKeyFile>GM.StrongNameKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="GM.Utility, Version=1.2.7.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
<HintPath>..\packages\GM.Utility.1.2.7\lib\netstandard2.0\GM.Utility.dll</HintPath>
<Reference Include="GM.Utility, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
<HintPath>..\packages\GM.Utility.1.3.0\lib\netstandard2.0\GM.Utility.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extensions: .cs
/*
MIT License

Copyright (c) %CurrentYear% Grega Mohorko
Copyright (c) %CurrentYear% Gregor Mohorko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -32,7 +32,7 @@ extensions: .xaml .xml .config .xsd
<!--
MIT License

Copyright (c) %CurrentYear% Grega Mohorko
Copyright (c) %CurrentYear% Gregor Mohorko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
29 changes: 27 additions & 2 deletions src/BlueUpdate/BlueUpdate Updater/CodeBits/ByteSizeFriendlyName.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
/* Documentation: http://codebits.codeplex.com/wikipage?title=ByteSizeFriendlyName */
#region --- License & Copyright Notice ---
/*
Useful code blocks that can included in your C# projects through NuGet
Copyright (c) 2012-2019 Jeevan James
All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#endregion

/* Documentation: https://github.com/JeevanJames/CodeBits/wiki/ByteSizeFriendlyName */

using System;
using System.Collections.Generic;
Expand All @@ -7,7 +27,12 @@ namespace CodeBits
{
public static partial class ByteSizeFriendlyName
{
public static string Build(long bytes, FriendlyNameOptions options = null)
public static string Build(long bytes)
{
return Build(bytes, null);
}

public static string Build(long bytes, FriendlyNameOptions options)
{
if (bytes < 0)
throw new ArgumentOutOfRangeException("bytes", "bytes cannot be a negative value");
Expand Down
8 changes: 4 additions & 4 deletions src/BlueUpdate/BlueUpdate Updater/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
[assembly: AssemblyTitle("BlueUpdate Updater")]
[assembly: AssemblyDescription("A toolkit for automatic updating of .NET applications from the web. Can be used as a deployment tool.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Grega Mohorko")]
[assembly: AssemblyCompany("Gregor Mohorko")]
[assembly: AssemblyProduct("BlueUpdate Updater")]
[assembly: AssemblyCopyright("Copyright © Grega Mohorko 2018")]
[assembly: AssemblyCopyright("Copyright © Gregor Mohorko 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down Expand Up @@ -79,5 +79,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// 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.0.3.3")]
[assembly: AssemblyFileVersion("1.0.3.3")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
111 changes: 52 additions & 59 deletions src/BlueUpdate/BlueUpdate Updater/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 15 additions & 19 deletions src/BlueUpdate/BlueUpdate Updater/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/BlueUpdate/BlueUpdate Updater/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ Created: 2018-7-17
Author: GregaMohorko
-->
<packages>
<package id="CodeBits.ByteSizeFriendlyName" version="1.1.0" targetFramework="net461" />
<package id="GM.Utility" version="1.2.7" targetFramework="net461" />
<package id="CodeBits.ByteSizeFriendlyName" version="1.2.0" targetFramework="net461" />
<package id="GM.Utility" version="1.3.0" targetFramework="net461" />
</packages>
10 changes: 6 additions & 4 deletions src/BlueUpdate/BlueUpdate/BlueUpdate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BlueUpdate</RootNamespace>
<AssemblyName>BlueUpdate</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -24,14 +25,15 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\BlueUpdate.XML</DocumentationFile>
<NoWarn>1591</NoWarn>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand All @@ -40,8 +42,8 @@
<AssemblyOriginatorKeyFile>GM.StrongNameKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="GM.Utility, Version=1.2.7.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
<HintPath>..\packages\GM.Utility.1.2.7\lib\netstandard2.0\GM.Utility.dll</HintPath>
<Reference Include="GM.Utility, Version=1.3.0.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
<HintPath>..\packages\GM.Utility.1.3.0\lib\netstandard2.0\GM.Utility.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down
Loading

0 comments on commit 163a5e2

Please sign in to comment.