diff --git a/Kaehler.scr/App.xaml.cs b/Kaehler.scr/App.xaml.cs index 244fda5..63c9edb 100644 --- a/Kaehler.scr/App.xaml.cs +++ b/Kaehler.scr/App.xaml.cs @@ -37,6 +37,7 @@ namespace Kaehler.scr CheckForExistingInstance(); if (e.Args.GetLength(0) > 0) // es gibt einen Parameter { + //System.Windows.MessageBox.Show("Parameter 0 ist: " + e.Args[0]); // Normal screensaver mode. if (e.Args[0].ToLower().StartsWith("/s")) { @@ -46,7 +47,9 @@ namespace Kaehler.scr { if (e.Args[0].ToLower().StartsWith("/c")) { - System.Windows.MessageBox.Show("Es gibt noch keine Konfigurationsmöglichkeit."); + //System.Windows.MessageBox.Show("Es gibt nur eine Konfigurationsmöglichkeit..."); + SetupForm sf = new SetupForm(); + sf.ShowDialog(); } //if (e.Args[0].ToLower().StartsWith("/p")) //{ @@ -57,6 +60,9 @@ namespace Kaehler.scr } else // kein Parameter App-Mode { + //nur Test! + //SetupForm sf = new SetupForm(); + //sf.ShowDialog(); StartScreenSaver(); } } @@ -108,6 +114,7 @@ namespace Kaehler.scr } /* ******************************************************************* */ //creates window on other screens +/* */ foreach (System.Windows.Forms.Screen screen in System.Windows.Forms.Screen.AllScreens) { if (screen == System.Windows.Forms.Screen.PrimaryScreen) @@ -123,8 +130,8 @@ namespace Kaehler.scr window.Height = location.Height + 14; window.Show(); window.LayoutReset(); - } +/* */ /* ******************************************************************* */ } catch (Exception ex) diff --git a/Kaehler.scr/Kaehler.scr.csproj b/Kaehler.scr/Kaehler.scr.csproj index f29dcf6..2c3e1c3 100644 --- a/Kaehler.scr/Kaehler.scr.csproj +++ b/Kaehler.scr/Kaehler.scr.csproj @@ -2,10 +2,31 @@ WinExe - net7.0-windows + net8.0-windows8.0 enable True True + Kaehler.scr.App + icon.ico + + + + + + + True + True + Settings.settings + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + diff --git a/Kaehler.scr/Kaehler.scr.csproj.user b/Kaehler.scr/Kaehler.scr.csproj.user index 644b0a6..13c9090 100644 --- a/Kaehler.scr/Kaehler.scr.csproj.user +++ b/Kaehler.scr/Kaehler.scr.csproj.user @@ -6,6 +6,11 @@ Designer + + + Form + + Designer diff --git a/Kaehler.scr/MainWindow.xaml b/Kaehler.scr/MainWindow.xaml index 3cde0ac..b397f76 100644 --- a/Kaehler.scr/MainWindow.xaml +++ b/Kaehler.scr/MainWindow.xaml @@ -1,7 +1,7 @@  + Title="Kaehler.scr" Height="350" Width="525" ShowInTaskbar="False" Topmost="False" WindowStartupLocation="Manual" WindowState="Normal" WindowStyle="None" MouseLeftButtonUp="Window_MouseLeftButtonUp" MouseRightButtonUp="Window_MouseRightButtonUp" MouseDoubleClick="Window_MouseDoubleClick" KeyUp="Window_KeyUp" ResizeMode="NoResize" Background="Black" AllowsTransparency="True" Cursor="None" Opacity="0.1" Loaded="Window_Loaded" Foreground="#FFF2E6E6" Name="ScrWindow"> diff --git a/Kaehler.scr/MainWindow.xaml.cs b/Kaehler.scr/MainWindow.xaml.cs index a6dafa9..ea94c5c 100644 --- a/Kaehler.scr/MainWindow.xaml.cs +++ b/Kaehler.scr/MainWindow.xaml.cs @@ -17,6 +17,10 @@ using System.Net.Cache; using System.IO; using System.Net; using System.Diagnostics; +using Microsoft.Win32; +using System.Net.Http; +using System.Windows.Media.TextFormatting; +using System.Threading.Tasks; //using System.Drawing; @@ -27,10 +31,12 @@ namespace Kaehler.scr /// public partial class MainWindow : Window { - const int cTimerStart = 1; - const int cStartAnzeige = 12; - const int cAusblenden = 11; - const int cTimerDeAni = 31; //war 21 + private int cTimerStart = 1; + private int cStartAnzeige = 12; + private int cAusblenden = 11; + private int cTimerDeAni = 31; + private int iGrundwert = 30; + private int iAbweichung = 10; private DispatcherTimer randTimer; private bool bRandTimer; @@ -42,6 +48,11 @@ namespace Kaehler.scr public MainWindow() { InitializeComponent(); + oRand = new Random(); + bRandTimer = false; + CheckReg(); + iGrundwert = ReadFromReg("Grundwert", iGrundwert); + iAbweichung = ReadFromReg("Abweichung", iAbweichung); } public void SCRBeenden() @@ -49,6 +60,41 @@ namespace Kaehler.scr App.Current.Shutdown(); } + private void CheckReg() + { + RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true); + RegistryKey subkey = key.OpenSubKey("Kaehler.SCR", true); + if (subkey == null) + { + key.CreateSubKey("Kaehler.SCR"); + } + subkey = key.OpenSubKey("Kaehler.SCR", true); + Object oTest1 = subkey.GetValue("Grundwert"); + if (oTest1 == null) + { + subkey.SetValue("Grundwert", 30); + } + Object oTest2 = subkey.GetValue("Abweichung"); + if (oTest2 == null) + { + subkey.SetValue("Abweichung", 10); + } + + } + + + private int ReadFromReg(String sName, int iDefault) + { + int iRet = iDefault; + RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true); + RegistryKey subkey = key.OpenSubKey("Kaehler.SCR", true); + Object oTest = subkey.GetValue(sName); + if (oTest != null) + iRet = int.Parse(oTest.ToString()); + + return iRet; + } + private void Window_Loaded(object sender, RoutedEventArgs e) { try @@ -74,13 +120,13 @@ namespace Kaehler.scr private void Logge(string sLogText) { - Console.WriteLine(sLogText); + Trace.WriteLine(sLogText); SimpleEventLog(sLogText,false); } private void LoggeFehler(string sLogText) { - Console.WriteLine(sLogText); + Trace.WriteLine(sLogText); SimpleEventLog(sLogText, true); } @@ -97,10 +143,14 @@ namespace Kaehler.scr // ... beginne mit Zitat LoadZoomZitat(); randCounter = cTimerDeAni; // 1 x 10s bis zur DeAnimation + //Logge("Schalte Tooltip ab ..."); + //this.ToolTip.ShowAlways(false); } // cAusblenden ... cStartAnzeige = Pause else if (randCounter == cStartAnzeige) //Starte zufällige Anzeige { + //Zeiten neu festlegen: + cTimerDeAni = iGrundwert + oRand.Next(-iAbweichung, iAbweichung); //Auswürfeln .. LayoutReset(); iAktivesElement = (int)oRand.Next(7); @@ -457,14 +507,26 @@ namespace Kaehler.scr Logge("Zitat ani ..."); try { - DoubleAnimation da = new DoubleAnimation(); - da.From = 0; - da.To = 1; - da.Duration = new Duration(TimeSpan.FromSeconds(1)); + int iFont = 32; + if (imageSCR.Width < 1800) + { + iFont = 24; + } + DoubleAnimation da1 = new DoubleAnimation(); + da1.From = 0; + da1.To = 1; + da1.Duration = new Duration(TimeSpan.FromSeconds(2)); + DoubleAnimation da2 = new DoubleAnimation(); + da2.From = 16; + da2.To = iFont; + da2.Duration = new Duration(TimeSpan.FromSeconds(3)); Storyboard sb = new Storyboard(); - sb.Children.Add(da); - Storyboard.SetTargetName(da, txtZitat.Name); - Storyboard.SetTargetProperty(da, new PropertyPath("(Opacity)")); + sb.Children.Add(da1); + sb.Children.Add(da2); + Storyboard.SetTargetName(da1, txtZitat.Name); + Storyboard.SetTargetProperty(da1, new PropertyPath("(Opacity)")); + Storyboard.SetTargetName(da2, txtZitat.Name); + Storyboard.SetTargetProperty(da2, new PropertyPath("(FontSize)")); this.Resources.Clear(); this.Resources.Add("AniZitat", sb); txtZitat.Visibility = Visibility.Visible; @@ -483,14 +545,26 @@ namespace Kaehler.scr Logge("Zitat de-ani ..."); try { - DoubleAnimation da = new DoubleAnimation(); - da.From = 1; - da.To = 0; - da.Duration = new Duration(TimeSpan.FromSeconds(2)); + int iFont = 32; + if (imageSCR.Width < 1800) + { + iFont = 24; + } + DoubleAnimation da1 = new DoubleAnimation(); + da1.From = 1; + da1.To = 0; + da1.Duration = new Duration(TimeSpan.FromSeconds(2)); + DoubleAnimation da2 = new DoubleAnimation(); + da2.From = iFont; + da2.To = 16; + da2.Duration = new Duration(TimeSpan.FromSeconds(2)); Storyboard sb = new Storyboard(); - sb.Children.Add(da); - Storyboard.SetTargetName(da, txtZitat.Name); - Storyboard.SetTargetProperty(da, new PropertyPath("(Opacity)")); + sb.Children.Add(da1); + sb.Children.Add(da2); + Storyboard.SetTargetName(da1, txtZitat.Name); + Storyboard.SetTargetProperty(da1, new PropertyPath("(Opacity)")); + Storyboard.SetTargetName(da2, txtZitat.Name); + Storyboard.SetTargetProperty(da2, new PropertyPath("(FontSize)")); this.Resources.Clear(); this.Resources.Add("DeAniZitat", sb); sb.Begin(); @@ -611,11 +685,11 @@ namespace Kaehler.scr try { //WebRequest request = WebRequest.Create(new Uri(TextUrl, UriKind.Absolute)); + /* The OLD Way: WebRequest request = WebRequest.Create(TextUrl); request.Timeout = 500; - ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; WebResponse response = request.GetResponse(); - Console.WriteLine(((HttpWebResponse)response).StatusDescription); + Trace.WriteLine(((HttpWebResponse)response).StatusDescription); Stream responseStream = response.GetResponseStream(); BinaryReader reader = new BinaryReader(responseStream); MemoryStream memoryStream = new MemoryStream(); @@ -629,6 +703,12 @@ namespace Kaehler.scr memoryStream.Seek(0, SeekOrigin.Begin); StreamReader readerTXT = new StreamReader(memoryStream); sDummy = readerTXT.ReadToEnd(); + */ + var client = new HttpClient(); + var webRequest = new HttpRequestMessage(HttpMethod.Get, TextUrl); + var response = client.Send(webRequest); + using var reader = new StreamReader(response.Content.ReadAsStream()); + sDummy = reader.ReadToEnd(); } catch (Exception ex) { @@ -668,6 +748,7 @@ namespace Kaehler.scr if (!File.Exists(sCacheFileName)) { //WebRequest request = WebRequest.Create(new Uri(ImageUrl, UriKind.Absolute)); + /* The Old Way: WebRequest request = WebRequest.Create(ImageUrl); request.Timeout = 500; ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; @@ -675,17 +756,30 @@ namespace Kaehler.scr Stream responseStream = response.GetResponseStream(); BinaryReader reader = new BinaryReader(responseStream); MemoryStream memoryStream = new MemoryStream(); + */ + + var client = new HttpClient(); + var webRequest = new HttpRequestMessage(HttpMethod.Get, ImageUrl); + var response = client.Send(webRequest); + //using var reader = new StreamReader(response.Content.ReadAsStream()); + var task = Task.Run(() => response.Content.ReadAsByteArrayAsync()); + task.Wait(); + byte[] bytebuffer = task.Result; + /* byte[] bytebuffer = new byte[BytesToRead]; + reader.re int bytesRead = reader.Read(bytebuffer, 0, BytesToRead); while (bytesRead > 0) { memoryStream.Write(bytebuffer, 0, bytesRead); bytesRead = reader.Read(bytebuffer, 0, BytesToRead); } + */ tmpImage.BeginInit(); - memoryStream.Seek(0, SeekOrigin.Begin); - tmpImage.StreamSource = memoryStream; + //memoryStream.Seek(0, SeekOrigin.Begin); + //tmpImage.StreamSource = imgResponse; + tmpImage.StreamSource = new MemoryStream(bytebuffer); tmpImage.EndInit(); ZielImage.Source = tmpImage; diff --git a/Kaehler.scr/Properties/Settings.Designer.cs b/Kaehler.scr/Properties/Settings.Designer.cs new file mode 100644 index 0000000..12b8790 --- /dev/null +++ b/Kaehler.scr/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace Kaehler.scr.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Kaehler.scr/Properties/Settings.settings b/Kaehler.scr/Properties/Settings.settings new file mode 100644 index 0000000..049245f --- /dev/null +++ b/Kaehler.scr/Properties/Settings.settings @@ -0,0 +1,6 @@ + + + + + + diff --git a/Kaehler.scr/SetupForm.Designer.cs b/Kaehler.scr/SetupForm.Designer.cs new file mode 100644 index 0000000..f344c4f --- /dev/null +++ b/Kaehler.scr/SetupForm.Designer.cs @@ -0,0 +1,153 @@ +namespace Kaehler.scr +{ + partial class SetupForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + button1 = new System.Windows.Forms.Button(); + textBox1 = new System.Windows.Forms.TextBox(); + trackBar1 = new System.Windows.Forms.TrackBar(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + trackBar2 = new System.Windows.Forms.TrackBar(); + textBox2 = new System.Windows.Forms.TextBox(); + label3 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)trackBar1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)trackBar2).BeginInit(); + SuspendLayout(); + // + // button1 + // + button1.Location = new System.Drawing.Point(405, 166); + button1.Name = "button1"; + button1.Size = new System.Drawing.Size(89, 29); + button1.TabIndex = 0; + button1.Text = "OK"; + button1.UseVisualStyleBackColor = true; + button1.Click += button1_Click; + // + // textBox1 + // + textBox1.Location = new System.Drawing.Point(86, 54); + textBox1.Name = "textBox1"; + textBox1.Size = new System.Drawing.Size(35, 23); + textBox1.TabIndex = 1; + textBox1.TextChanged += textBox1_TextChanged; + // + // trackBar1 + // + trackBar1.Location = new System.Drawing.Point(50, 80); + trackBar1.Maximum = 300; + trackBar1.Minimum = 5; + trackBar1.Name = "trackBar1"; + trackBar1.Size = new System.Drawing.Size(97, 45); + trackBar1.TabIndex = 2; + trackBar1.Value = 5; + trackBar1.Scroll += trackBar1_Scroll; + trackBar1.Move += trackBar1_Move; + // + // label1 + // + label1.Location = new System.Drawing.Point(12, 56); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(68, 21); + label1.TabIndex = 3; + label1.Text = "Grundwert"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(147, 54); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(74, 15); + label2.TabIndex = 4; + label2.Text = "Abweichung"; + // + // trackBar2 + // + trackBar2.Location = new System.Drawing.Point(204, 80); + trackBar2.Maximum = 15; + trackBar2.Minimum = 5; + trackBar2.Name = "trackBar2"; + trackBar2.Size = new System.Drawing.Size(83, 45); + trackBar2.TabIndex = 5; + trackBar2.Value = 5; + trackBar2.Scroll += trackBar2_Scroll; + trackBar2.Move += trackBar2_Move; + // + // textBox2 + // + textBox2.Location = new System.Drawing.Point(227, 53); + textBox2.Name = "textBox2"; + textBox2.Size = new System.Drawing.Size(38, 23); + textBox2.TabIndex = 6; + textBox2.TextChanged += textBox2_TextChanged; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(12, 19); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(86, 15); + label3.TabIndex = 7; + label3.Text = "Wechsel-Timer"; + // + // SetupForm + // + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(526, 217); + Controls.Add(label3); + Controls.Add(textBox2); + Controls.Add(trackBar2); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(trackBar1); + Controls.Add(textBox1); + Controls.Add(button1); + MaximizeBox = false; + MinimizeBox = false; + Name = "SetupForm"; + Text = "Setup"; + ((System.ComponentModel.ISupportInitialize)trackBar1).EndInit(); + ((System.ComponentModel.ISupportInitialize)trackBar2).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TrackBar trackBar1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TrackBar trackBar2; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label3; + } +} \ No newline at end of file diff --git a/Kaehler.scr/SetupForm.cs b/Kaehler.scr/SetupForm.cs new file mode 100644 index 0000000..0db35dd --- /dev/null +++ b/Kaehler.scr/SetupForm.cs @@ -0,0 +1,116 @@ +using Microsoft.Win32; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows.Forms.VisualStyles; + +namespace Kaehler.scr +{ + public partial class SetupForm : Form + { + private int iGrundwert = 30; + private int iAbweichung = 1; + + public SetupForm() + { + InitializeComponent(); + CheckReg(); + iGrundwert = ReadFromReg("Grundwert", iGrundwert); + iAbweichung = ReadFromReg("Abweichung", iAbweichung); + textBox1.Text = iGrundwert.ToString(); + textBox2.Text = iAbweichung.ToString(); + trackBar1.Value = iGrundwert; + trackBar2.Value = iAbweichung; + } + + private void textBox1_TextChanged(object sender, EventArgs e) + { + iGrundwert = int.Parse(textBox1.Text); + trackBar1.Value = iGrundwert; + } + + private void textBox2_TextChanged(object sender, EventArgs e) + { + iAbweichung = int.Parse(textBox2.Text); + trackBar2.Value = iAbweichung; + } + private void trackBar1_Scroll(object sender, EventArgs e) + { + iGrundwert = trackBar1.Value; + textBox1.Text=iGrundwert.ToString(); + } + private void trackBar2_Scroll(object sender, EventArgs e) + { + iAbweichung = trackBar2.Value; + textBox2.Text = iAbweichung.ToString(); + } + private void trackBar1_Move(object sender, EventArgs e) + { + iGrundwert = trackBar1.Value; + textBox1.Text = iGrundwert.ToString(); + } + private void trackBar2_Move(object sender, EventArgs e) + { + iAbweichung = trackBar2.Value; + textBox2.Text = iAbweichung.ToString(); + } + + private void CheckReg() + { + RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true); + RegistryKey subkey = key.OpenSubKey("Kaehler.SCR", true); + if (subkey == null) + { + key.CreateSubKey("Kaehler.SCR"); + } + subkey = key.OpenSubKey("Kaehler.SCR", true); + Object oTest1 = subkey.GetValue("Grundwert"); + if (oTest1 == null) + { + subkey.SetValue("Grundwert", 30); + } + Object oTest2 = subkey.GetValue("Abweichung"); + if (oTest2 == null) + { + subkey.SetValue("Abweichung", 10); + } + + } + + + private int ReadFromReg(String sName, int iDefault) + { + int iRet = iDefault; + RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true); + RegistryKey subkey = key.OpenSubKey("Kaehler.SCR", true); + Object oTest = subkey.GetValue(sName); + if (oTest != null) + iRet = int.Parse(oTest.ToString()); + + return iRet; + } + + private void WriteToReg(String sName, int iWert) + { + RegistryKey key = Registry.CurrentUser.OpenSubKey("Software", true); + RegistryKey subkey = key.OpenSubKey("Kaehler.SCR", true); + subkey.SetValue(sName, iWert); + } + + private void button1_Click(object sender, EventArgs e) + { + WriteToReg("Grundwert", iGrundwert); + WriteToReg("Abweichung", iAbweichung); + this.Close(); + } + + + } + +} diff --git a/Kaehler.scr/SetupForm.resx b/Kaehler.scr/SetupForm.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/Kaehler.scr/SetupForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache index f7a8e5a..7993116 100644 --- a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache +++ b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache @@ -1 +1 @@ -34da4b791e7718163d18b3313dff15be1443ca85 +5fd17a86bec36fd309d972d879d9cf15ab9af1d307060ba552c93272402edd31 diff --git a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig index a47d74f..e34b182 100644 --- a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig +++ b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Kaehler.scr -build_property.ProjectDir = \\NAS\Test\src\Kaehler.scr\ +build_property.ProjectDir = \\nas\Test\src\Kaehler.scr\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.assets.cache b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.assets.cache index 94084b3..631fb22 100644 Binary files a/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.assets.cache and b/Kaehler.scr/obj/Debug/net7.0-windows/Kaehler.scr.assets.cache differ diff --git a/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.dgspec.json b/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.dgspec.json index 6da57cc..b123529 100644 --- a/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.dgspec.json +++ b/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.dgspec.json @@ -1,37 +1,35 @@ { "format": 1, "restore": { - "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj": {} + "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj": {} }, "projects": { - "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj": { + "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj", + "projectUniqueName": "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj", "projectName": "Kaehler.scr", - "projectPath": "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj", - "packagesPath": "C:\\Users\\Robert\\.nuget\\packages\\", - "outputPath": "T:\\src\\Kaehler.scr\\obj\\", + "projectPath": "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj", + "packagesPath": "C:\\Users\\rkaehler\\.nuget\\packages\\", + "outputPath": "C:\\Projekte\\_Privat\\Kaehler.scr\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Robert\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\rkaehler\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ - "net7.0-windows" + "net8.0-windows8.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, - "https://api.nuget.org/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {} }, "frameworks": { - "net7.0-windows7.0": { - "targetAlias": "net7.0-windows", + "net8.0-windows8.0": { + "targetAlias": "net8.0-windows8.0", "projectReferences": {} } }, @@ -39,11 +37,16 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net7.0-windows7.0": { - "targetAlias": "net7.0-windows", + "net8.0-windows8.0": { + "targetAlias": "net8.0-windows8.0", "imports": [ "net461", "net462", @@ -63,7 +66,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.g.props b/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.g.props index 59e0a64..413e279 100644 --- a/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.g.props +++ b/Kaehler.scr/obj/Kaehler.scr.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Robert\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\rkaehler\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.4.0 + 6.11.1 - + \ No newline at end of file diff --git a/Kaehler.scr/obj/Release/net7.0-windows/App.g.i.cs b/Kaehler.scr/obj/Release/net7.0-windows/App.g.i.cs index 096c321..455da55 100644 --- a/Kaehler.scr/obj/Release/net7.0-windows/App.g.i.cs +++ b/Kaehler.scr/obj/Release/net7.0-windows/App.g.i.cs @@ -45,7 +45,7 @@ namespace Kaehler.scr { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.17.0")] public void InitializeComponent() { #line 4 "..\..\..\App.xaml" @@ -60,7 +60,7 @@ namespace Kaehler.scr { /// [System.STAThreadAttribute()] [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.17.0")] public static void Main() { Kaehler.scr.App app = new Kaehler.scr.App(); app.InitializeComponent(); diff --git a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache index e0c80ab..a9e7bee 100644 --- a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache +++ b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.AssemblyInfoInputs.cache @@ -1 +1 @@ -7aba713d409dea39b0cea699ba890bf6025927fd +9b279863e1ee3d8ab08b17af958db03132f2059641036eea629bb73e35c47158 diff --git a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig index 03c4797..e34b182 100644 --- a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig +++ b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.GeneratedMSBuildEditorConfig.editorconfig @@ -14,4 +14,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Kaehler.scr -build_property.ProjectDir = T:\src\Kaehler.scr\ +build_property.ProjectDir = \\nas\Test\src\Kaehler.scr\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.assets.cache b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.assets.cache index 8ed3bbf..c88d69c 100644 Binary files a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.assets.cache and b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.assets.cache differ diff --git a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.csproj.AssemblyReference.cache b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.csproj.AssemblyReference.cache index 123b014..b103654 100644 Binary files a/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.csproj.AssemblyReference.cache and b/Kaehler.scr/obj/Release/net7.0-windows/Kaehler.scr.csproj.AssemblyReference.cache differ diff --git a/Kaehler.scr/obj/Release/net7.0-windows/MainWindow.g.i.cs b/Kaehler.scr/obj/Release/net7.0-windows/MainWindow.g.i.cs index ac23dac..512d652 100644 --- a/Kaehler.scr/obj/Release/net7.0-windows/MainWindow.g.i.cs +++ b/Kaehler.scr/obj/Release/net7.0-windows/MainWindow.g.i.cs @@ -127,13 +127,13 @@ namespace Kaehler.scr { /// InitializeComponent /// [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.17.0")] public void InitializeComponent() { if (_contentLoaded) { return; } _contentLoaded = true; - System.Uri resourceLocater = new System.Uri("/Kaehler.scr;component/mainwindow.xaml", System.UriKind.Relative); + System.Uri resourceLocater = new System.Uri("/Kaehler.scr;V1.0.0.0;component/mainwindow.xaml", System.UriKind.Relative); #line 1 "..\..\..\MainWindow.xaml" System.Windows.Application.LoadComponent(this, resourceLocater); @@ -143,7 +143,7 @@ namespace Kaehler.scr { } [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.17.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] diff --git a/Kaehler.scr/obj/Release/net7.0-windows/apphost.exe b/Kaehler.scr/obj/Release/net7.0-windows/apphost.exe index 4e4f4bf..7dd2666 100644 Binary files a/Kaehler.scr/obj/Release/net7.0-windows/apphost.exe and b/Kaehler.scr/obj/Release/net7.0-windows/apphost.exe differ diff --git a/Kaehler.scr/obj/project.assets.json b/Kaehler.scr/obj/project.assets.json index 263dd80..f2f030f 100644 --- a/Kaehler.scr/obj/project.assets.json +++ b/Kaehler.scr/obj/project.assets.json @@ -1,44 +1,42 @@ { "version": 3, "targets": { - "net7.0-windows7.0": {} + "net8.0-windows8.0": {} }, "libraries": {}, "projectFileDependencyGroups": { - "net7.0-windows7.0": [] + "net8.0-windows8.0": [] }, "packageFolders": { - "C:\\Users\\Robert\\.nuget\\packages\\": {}, + "C:\\Users\\rkaehler\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj", + "projectUniqueName": "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj", "projectName": "Kaehler.scr", - "projectPath": "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj", - "packagesPath": "C:\\Users\\Robert\\.nuget\\packages\\", - "outputPath": "T:\\src\\Kaehler.scr\\obj\\", + "projectPath": "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj", + "packagesPath": "C:\\Users\\rkaehler\\.nuget\\packages\\", + "outputPath": "C:\\Projekte\\_Privat\\Kaehler.scr\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Robert\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\rkaehler\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ - "net7.0-windows" + "net8.0-windows8.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, - "https://api.nuget.org/v3/index.json": {} + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {} }, "frameworks": { - "net7.0-windows7.0": { - "targetAlias": "net7.0-windows", + "net8.0-windows8.0": { + "targetAlias": "net8.0-windows8.0", "projectReferences": {} } }, @@ -46,11 +44,16 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net7.0-windows7.0": { - "targetAlias": "net7.0-windows", + "net8.0-windows8.0": { + "targetAlias": "net8.0-windows8.0", "imports": [ "net461", "net462", @@ -70,7 +73,7 @@ "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Kaehler.scr/obj/project.nuget.cache b/Kaehler.scr/obj/project.nuget.cache index 7e9d0fb..eebc1d5 100644 --- a/Kaehler.scr/obj/project.nuget.cache +++ b/Kaehler.scr/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "XP5y4Yw5lNu2H2qGkid9cUz0xyKkFvwxBTobd2IE4ezjP79QT+DvOPWBbk2tSdVfeWw/I+hJMbk6nZM7UtRuoQ==", + "dgSpecHash": "+untOBr2e9M=", "success": true, - "projectFilePath": "T:\\src\\Kaehler.scr\\Kaehler.scr.csproj", + "projectFilePath": "C:\\Projekte\\_Privat\\Kaehler.scr\\Kaehler.scr.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file