Browse Source

Fody costura

yuzhengyang 8 years ago
parent
commit
29ccb40869

+ 1 - 1
Fork.Net/Oreo.PCMonitor/FodyWeavers.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Weavers>
-  <Costura />
+  <Costura/>
 </Weavers>

+ 2 - 2
Fork.Net/Oreo.PCMonitor/Oreo.PCMonitor.csproj

@@ -127,10 +127,10 @@
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.0.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
   </Target>
   <Import Project="..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\portable-net+sl+win+wpa+wp\Costura.Fody.targets')" />
-  <Import Project="..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.2.1.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
+  <Import Project="..\packages\Fody.2.0.0\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

+ 1 - 1
Fork.Net/Oreo.PCMonitor/Views/NetDetailsWindow.xaml

@@ -14,7 +14,7 @@
                 <Grid Background="#FFE5E5E5">
                     <DataGrid x:Name="dataGrid" HorizontalAlignment="Left" VerticalAlignment="Top" Height="307" Width="616" ColumnWidth="SizeToHeader" ItemsSource="{Binding ObNetPro}" AutoGenerateColumns="False">
                         <DataGrid.Columns>
-                            <DataGridTextColumn Binding="{Binding ProcessName}" ClipboardContentBinding="{x:Null}" Header="名称"/>
+                            <DataGridTextColumn Binding="{Binding ProcessName}" ClipboardContentBinding="{x:Null}" Header="名称" Width="150"/>
                             <DataGridTextColumn Binding="{Binding DownloadData}" ClipboardContentBinding="{x:Null}" Header="下载速度"/>
                             <DataGridTextColumn Binding="{Binding UploadData}" ClipboardContentBinding="{x:Null}" Header="上传速度"/>
                             <DataGridTextColumn Binding="{Binding DownloadData}" ClipboardContentBinding="{x:Null}" Header="已下载流量"/>

+ 1 - 1
Fork.Net/Oreo.PCMonitor/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="1.6.2" targetFramework="net40" developmentDependency="true" />
-  <package id="Fody" version="2.1.0" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="2.0.0" targetFramework="net40" developmentDependency="true" />
 </packages>

+ 3 - 0
Fork.Net/Y.Skin/YoForm/Irregular/IrregularForm.Designer.cs

@@ -34,7 +34,10 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.SystemColors.Control;
+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(284, 261);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "IrregularForm";
             this.Text = "IrregularForm";
             this.Load += new System.EventHandler(this.IrregularForm_Load);

+ 2 - 0
Fork.Net/Y.Skin/YoForm/Irregular/IrregularFormSkin.Designer.cs

@@ -34,7 +34,9 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(284, 261);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "IrregularFormSkin";
             this.Text = "IrregularFormSkin";
             this.ResumeLayout(false);

+ 73 - 14
Fork.Net/Y.Test/Views/MainForm.Designer.cs

@@ -47,14 +47,22 @@
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.pictureBox6 = new System.Windows.Forms.PictureBox();
+            this.pictureBox5 = new System.Windows.Forms.PictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
             this.SuspendLayout();
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(77, 136);
+            this.button1.Location = new System.Drawing.Point(419, 321);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 0;
@@ -65,7 +73,7 @@
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Location = new System.Drawing.Point(164, 229);
+            this.checkBox1.Location = new System.Drawing.Point(416, 350);
             this.checkBox1.Name = "checkBox1";
             this.checkBox1.Size = new System.Drawing.Size(78, 16);
             this.checkBox1.TabIndex = 1;
@@ -75,7 +83,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(185, 292);
+            this.label1.Location = new System.Drawing.Point(453, 369);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(41, 12);
             this.label1.TabIndex = 2;
@@ -91,7 +99,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(434, 130);
+            this.button2.Location = new System.Drawing.Point(433, 85);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 4;
@@ -101,7 +109,7 @@
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(434, 107);
+            this.button3.Location = new System.Drawing.Point(433, 62);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(75, 23);
             this.button3.TabIndex = 5;
@@ -110,7 +118,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(434, 153);
+            this.button4.Location = new System.Drawing.Point(433, 108);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(75, 23);
             this.button4.TabIndex = 6;
@@ -119,7 +127,7 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(434, 176);
+            this.button5.Location = new System.Drawing.Point(433, 131);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(75, 23);
             this.button5.TabIndex = 7;
@@ -128,7 +136,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(434, 199);
+            this.button6.Location = new System.Drawing.Point(433, 154);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(75, 23);
             this.button6.TabIndex = 8;
@@ -137,7 +145,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(434, 222);
+            this.button7.Location = new System.Drawing.Point(433, 177);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(75, 23);
             this.button7.TabIndex = 9;
@@ -146,7 +154,7 @@
             // 
             // button8
             // 
-            this.button8.Location = new System.Drawing.Point(434, 245);
+            this.button8.Location = new System.Drawing.Point(433, 200);
             this.button8.Name = "button8";
             this.button8.Size = new System.Drawing.Size(75, 23);
             this.button8.TabIndex = 10;
@@ -155,7 +163,7 @@
             // 
             // button9
             // 
-            this.button9.Location = new System.Drawing.Point(434, 268);
+            this.button9.Location = new System.Drawing.Point(433, 223);
             this.button9.Name = "button9";
             this.button9.Size = new System.Drawing.Size(75, 23);
             this.button9.TabIndex = 11;
@@ -164,7 +172,7 @@
             // 
             // button10
             // 
-            this.button10.Location = new System.Drawing.Point(434, 291);
+            this.button10.Location = new System.Drawing.Point(433, 246);
             this.button10.Name = "button10";
             this.button10.Size = new System.Drawing.Size(75, 23);
             this.button10.TabIndex = 12;
@@ -173,7 +181,7 @@
             // 
             // button11
             // 
-            this.button11.Location = new System.Drawing.Point(434, 314);
+            this.button11.Location = new System.Drawing.Point(433, 269);
             this.button11.Name = "button11";
             this.button11.Size = new System.Drawing.Size(75, 23);
             this.button11.TabIndex = 13;
@@ -182,7 +190,7 @@
             // 
             // button12
             // 
-            this.button12.Location = new System.Drawing.Point(434, 337);
+            this.button12.Location = new System.Drawing.Point(433, 292);
             this.button12.Name = "button12";
             this.button12.Size = new System.Drawing.Size(75, 23);
             this.button12.TabIndex = 14;
@@ -218,12 +226,54 @@
             this.pictureBox3.TabIndex = 17;
             this.pictureBox3.TabStop = false;
             // 
+            // panel1
+            // 
+            this.panel1.BackColor = System.Drawing.SystemColors.Control;
+            this.panel1.Controls.Add(this.pictureBox4);
+            this.panel1.Controls.Add(this.pictureBox6);
+            this.panel1.Controls.Add(this.pictureBox5);
+            this.panel1.Location = new System.Drawing.Point(46, 31);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(331, 371);
+            this.panel1.TabIndex = 18;
+            // 
+            // pictureBox4
+            // 
+            this.pictureBox4.Image = global::Y.Test.Properties.Resources.Rainbow;
+            this.pictureBox4.Location = new System.Drawing.Point(13, 226);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(151, 92);
+            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox4.TabIndex = 21;
+            this.pictureBox4.TabStop = false;
+            // 
+            // pictureBox6
+            // 
+            this.pictureBox6.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox6.Image")));
+            this.pictureBox6.Location = new System.Drawing.Point(13, 25);
+            this.pictureBox6.Name = "pictureBox6";
+            this.pictureBox6.Size = new System.Drawing.Size(241, 92);
+            this.pictureBox6.TabIndex = 19;
+            this.pictureBox6.TabStop = false;
+            // 
+            // pictureBox5
+            // 
+            this.pictureBox5.Image = global::Y.Test.Properties.Resources.Rainbow;
+            this.pictureBox5.Location = new System.Drawing.Point(13, 123);
+            this.pictureBox5.Name = "pictureBox5";
+            this.pictureBox5.Size = new System.Drawing.Size(151, 92);
+            this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox5.TabIndex = 20;
+            this.pictureBox5.TabStop = false;
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.ClientSize = new System.Drawing.Size(814, 470);
+            this.Controls.Add(this.panel1);
             this.Controls.Add(this.pictureBox3);
             this.Controls.Add(this.pictureBox2);
             this.Controls.Add(this.pictureBox1);
@@ -242,6 +292,7 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.button1);
+            this.DoubleBuffered = true;
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MainForm";
@@ -249,6 +300,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
+            this.panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -274,5 +329,9 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.PictureBox pictureBox3;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.PictureBox pictureBox4;
+        private System.Windows.Forms.PictureBox pictureBox6;
+        private System.Windows.Forms.PictureBox pictureBox5;
     }
 }

File diff suppressed because it is too large
+ 6864 - 0
Fork.Net/Y.Test/Views/MainForm.resx


Fork.Net/packages/Fody.2.1.0/Content/FodyWeavers.xml → Fork.Net/packages/Fody.2.0.0/Content/FodyWeavers.xml


BIN
Fork.Net/packages/Fody.2.0.0/Fody.2.0.0.nupkg


BIN
Fork.Net/packages/Fody.2.0.0/Fody.dll


BIN
Fork.Net/packages/Fody.2.0.0/FodyCommon.dll


BIN
Fork.Net/packages/Fody.2.0.0/FodyIsolated.dll


BIN
Fork.Net/packages/Fody.2.1.0/Mono.Cecil.Mdb.dll


BIN
Fork.Net/packages/Fody.2.0.0/Mono.Cecil.Pdb.dll


BIN
Fork.Net/packages/Fody.2.1.0/Mono.Cecil.Rocks.dll


BIN
Fork.Net/packages/Fody.2.0.0/Mono.Cecil.dll


Fork.Net/packages/Fody.2.1.0/Tools/install.ps1 → Fork.Net/packages/Fody.2.0.0/Tools/install.ps1


BIN
Fork.Net/packages/Fody.2.1.0/Fody.2.1.0.nupkg


BIN
Fork.Net/packages/Fody.2.1.0/Fody.dll


BIN
Fork.Net/packages/Fody.2.1.0/FodyCommon.dll


BIN
Fork.Net/packages/Fody.2.1.0/FodyIsolated.dll


BIN
Fork.Net/packages/Fody.2.1.0/Mono.Cecil.Pdb.dll


BIN
Fork.Net/packages/Fody.2.1.0/Mono.Cecil.dll