Skip to content

Commit

Permalink
Dev to Main Merge v2.0.0 (#11)
Browse files Browse the repository at this point in the history
* Add the ability to check for program updates on launch #6

* Fixed issue where checkForUpdate was being called more than once.

* Backend data rewrite (#7)

* Wrote a map for the categories to channel to make it load the channels for the selected category

* Rewrote rest functions and catches for user login 404.

* Rewrote epg loading (desc, title, times).

* Added progress count while loading data. Fixed the channel time range on UI of channel list, and made it related to local time. Added converting UNIX to current time. Formatting start/stop timestamps.

* Fixed the match for category name and removed category id from the match.

---------

* Fixed how windows are loaded and displayed.
Added feature #8

* Check up doesn't display a message box for no update anymore.

* Upgraded to target .NET 7 framework

* Commented out debug print outs and changed version to 2.0.0.

---------

primetime43
  • Loading branch information
primetime43 authored Feb 6, 2023
1 parent bc39599 commit 738ceb7
Show file tree
Hide file tree
Showing 14 changed files with 8,140 additions and 332 deletions.
83 changes: 15 additions & 68 deletions AnalysisReport.sarif
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"tool": {
"driver": {
"name": "Dependency Analysis",
"semanticVersion": "0.4.336902",
"semanticVersion": "0.4.355802",
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
"rules": [
{
Expand All @@ -32,39 +32,7 @@
{
"ruleId": "UA105",
"message": {
"text": "Package Extended.Wpf.Toolkit, Version=4.1.0 does not support the target(s) net6.0-windows but a newer version (4.4.0) does. Package Extended.Wpf.Toolkit needs to be upgraded from 4.1.0 to 4.4.0."
},
"locations": [
{
"physicalLocation": {
"artifactLocation": {
"uri": "file:///C:/Users/Mike/source/repos/Xtream-Browser/X-IPTV/X-IPTV.csproj"
},
"region": {}
}
}
]
},
{
"ruleId": "UA105",
"message": {
"text": "Package System.ComponentModel.Composition, Version=5.0.0 needs to be deleted."
},
"locations": [
{
"physicalLocation": {
"artifactLocation": {
"uri": "file:///C:/Users/Mike/source/repos/Xtream-Browser/X-IPTV/X-IPTV.csproj"
},
"region": {}
}
}
]
},
{
"ruleId": "UA105",
"message": {
"text": "Package System.IO, Version=4.3.0 needs to be deleted."
"text": "Package System.IO needs to be removed as its a transitive dependency that is not required"
},
"locations": [
{
Expand Down Expand Up @@ -112,39 +80,7 @@
{
"ruleId": "UA106",
"message": {
"text": "Package Extended.Wpf.Toolkit, Version=4.4.0 needs to be added."
},
"locations": [
{
"physicalLocation": {
"artifactLocation": {
"uri": "file:///C:/Users/Mike/source/repos/Xtream-Browser/X-IPTV/X-IPTV.csproj"
},
"region": {}
}
}
]
},
{
"ruleId": "UA106",
"message": {
"text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.4.336902 needs to be added."
},
"locations": [
{
"physicalLocation": {
"artifactLocation": {
"uri": "file:///C:/Users/Mike/source/repos/Xtream-Browser/X-IPTV/X-IPTV.csproj"
},
"region": {}
}
}
]
},
{
"ruleId": "UA106",
"message": {
"text": "Package Microsoft.Windows.Compatibility, Version=6.0.0 needs to be added."
"text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.4.355802 needs to be added."
},
"locations": [
{
Expand All @@ -164,7 +100,18 @@
"tool": {
"driver": {
"name": "API Upgradability",
"semanticVersion": "0.4.336902",
"semanticVersion": "0.4.355802",
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
}
},
"results": [],
"columnKind": "utf16CodeUnits"
},
{
"tool": {
"driver": {
"name": "Component Analysis",
"semanticVersion": "0.4.355802",
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
}
},
Expand Down
Loading

0 comments on commit 738ceb7

Please sign in to comment.