diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
index 81f82e3..1aa8249 100644
--- a/Crystallography.Controls/Crystallography.Controls.csproj
+++ b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
Library
net8.0-windows10.0.22621.0
true
- 2023.11.27.1027
- 2023.11.27.1027
+ 2023.11.27.1108
+ 2023.11.27.1108
PerMonitorV2
true
true
diff --git a/Crystallography/Atom/AtomStatic.cs b/Crystallography/Atom/AtomStatic.cs
index 317c169..4e263e4 100644
--- a/Crystallography/Atom/AtomStatic.cs
+++ b/Crystallography/Atom/AtomStatic.cs
@@ -1,8 +1,6 @@
using MathNet.Numerics.Integration;
using MathNet.Numerics.LinearAlgebra.Double;
-using Microsoft.VisualBasic;
using System;
-using System.Collections.Frozen;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
index de510f9..662c9fb 100644
--- a/Crystallography/Crystallography.csproj
+++ b/Crystallography/Crystallography.csproj
@@ -4,8 +4,8 @@
Library
net8.0-windows10.0.22621.0
true
- 2023.11.27.1027
- 2023.11.27.1027
+ 2023.11.27.1108
+ 2023.11.27.1108
7.0
diff --git a/Crystallography/Detector/Ring.cs b/Crystallography/Detector/Ring.cs
index 8222d33..b45328d 100644
--- a/Crystallography/Detector/Ring.cs
+++ b/Crystallography/Detector/Ring.cs
@@ -1264,6 +1264,7 @@ public static double[] GetCorrectedImageArray(IntegralProperty iP, double resolu
}
#endregion
+ #region GetUnrolledImageArray ŒX‚«•â³‚âƒsƒNƒZƒ‹•â³‚𜋎‚µ‚ÄØ‚èŠJ‚«‰æ‘œ‚ðì‚èo‚·ƒƒ\ƒbƒh
///
/// ŒX‚«•â³‚âƒsƒNƒZƒ‹•â³‚𜋎‚µ‚ÄØ‚èŠJ‚«‰æ‘œ‚ðì‚èo‚·ƒƒ\ƒbƒh
@@ -1312,6 +1313,7 @@ public static double[] GetUnrolledImageArray(IntegralProperty iP, int chiDivisio
return destPixels;
}
+
#region UnrolledImageArray ƒKƒ“ƒhƒ‹ƒtƒB
private static double[] GetUnrolledImageArrayGandlofi(IntegralProperty iP, int yMin, int yMax, double sectorStep, double startTheta, double endTheta, double stepTheta)
{
@@ -1443,6 +1445,8 @@ private static double[] GetUnrolledImageArrayGandlofi(IntegralProperty iP, int y
}
#endregion
+ #endregion
+
#region ‚¨‘ “ü‚è GetUnrolledImageArrayThread
///
/// ŒX‚«•â³‚âƒsƒNƒZƒ‹•â³‚𜋎‚µ‚ÄØ‚èŠJ‚«‰æ‘œ‚ðì‚èo‚·ƒƒ\ƒbƒh‚̃XƒŒƒbƒh
@@ -2644,11 +2648,11 @@ public static (double[][] Profile, double[][] Pixels) GetProfileThreadWithTiltCo
//IP‚Ì–@üƒxƒNƒgƒ‹
(double X, double Y, double Z) detector_normal = (Denom2, Denom1, -CosTau);
- var pt0 = new (double X, double Y)[8];
- var pt1 = new (double X, double Y)[8];
- var pt2 = new (double X, double Y)[8];
- var pt3 = new (double X, double Y)[8];
- var pt4 = new (double X, double Y)[8];
+ Span<(double X, double Y)> pt0 = stackalloc (double X, double Y)[8];
+ Span<(double X, double Y)> pt1 = stackalloc (double X, double Y)[8];
+ Span<(double X, double Y)> pt2 = stackalloc (double X, double Y)[8];
+ Span<(double X, double Y)> pt3 = stackalloc (double X, double Y)[8];
+ Span<(double X, double Y)> pt4 = stackalloc (double X, double Y)[8];
//‚±‚±‚©‚çÏ•ªŠJŽn
for (int j = yMin; j < yMax; j++)
@@ -2785,7 +2789,10 @@ public static (double[][] Profile, double[][] Pixels) GetProfileThreadWithTiltCo
if (n4 == 0)//ŽŸ‚̃|ƒŠƒSƒ“‚ª–³‚©‚Á‚½‚çI—¹
break;
- Array.Copy(pt4, pt1, n4);
+ //Array.Copy(pt4, pt1, n4);
+ for (int n = 0; i < n4; i++)
+ pt1[n] = pt4[n];
+
n1 = n4;
if (k2 == chiDivision - 1)
@@ -2795,7 +2802,10 @@ public static (double[][] Profile, double[][] Pixels) GetProfileThreadWithTiltCo
if (n2 == 0)//ŽŸ‚̃|ƒŠƒSƒ“‚ª–³‚©‚Á‚½‚çI—¹
break;
- Array.Copy(pt2, pt0, n2);
+ //Array.Copy(pt2, pt0, n2);
+ for (int n = 0; i < n2; i++)
+ pt0[n] = pt2[n];
+
n0 = n2;
#region 20200430 ã‚̃R[ƒh‚Å\•ª‘¬“x‚ªo‚é‚Ì‚ÅA‚¨‘ “ü‚è
@@ -2856,7 +2866,7 @@ public static (double[][] Profile, double[][] Pixels) GetProfileThreadWithTiltCo
///
///
///
- private static double getArea(int n, (double X, double Y)[] pt)
+ private static double getArea(int n, Span<(double X, double Y)> pt)
{
if (n < 3) return 0;
var result = pt[0].X * (pt[1].Y - pt[n - 1].Y) + pt[n - 1].X * (pt[0].Y - pt[n - 2].Y);
diff --git a/Crystallography/Profile.cs b/Crystallography/Profile.cs
index e021a90..385db80 100644
--- a/Crystallography/Profile.cs
+++ b/Crystallography/Profile.cs
@@ -1527,9 +1527,9 @@ public static double[] ConvertToD(double[] x, HorizontalAxisProperty src)
if (src.AxisMode == HorizontalAxis.d)
{
if (src.DspacingUnit == LengthUnitEnum.Angstrom)
- d = x;
- else if (src.DspacingUnit == LengthUnitEnum.NanoMeter)
d = x.Select(d => d * 0.1).ToArray();
+ else if (src.DspacingUnit == LengthUnitEnum.NanoMeter)
+ d = x;
}
else if (src.AxisMode == HorizontalAxis.Angle)
diff --git a/PDIndexer/FormMain.cs b/PDIndexer/FormMain.cs
index ad38997..800769c 100644
--- a/PDIndexer/FormMain.cs
+++ b/PDIndexer/FormMain.cs
@@ -934,8 +934,9 @@ public void SetDrawRangeLimit()
}
if (double.IsInfinity(MinimalX)) return;
- MinimalX = minimalX;
+ MinimalX = minimalX;//MinimalXãŒç›´è¿‘ã®MaximalXより大ãã‹ã£ãŸå ´åˆã€æ£å¸¸ã«æ›´æ–°ã§ããªã„。ãã®ãŸã‚ã€2行下ã§ã‚‚ã†ä¸€å›žæ›´æ–°ã€‚
MaximalX = maximalX;
+ MinimalX = minimalX;//2行上ã®ã‚³ãƒ¡ãƒ³ãƒˆå‚ç…§
MinimalY = Math.Min(0, minimalY);
MaximalY = maximalY * 1.1;
}
@@ -3031,6 +3032,7 @@ public void AddProfileToCheckedListBox(DiffractionProfile2 dp, bool isCheked, bo
if (WaveColor != dp.SrcProperty.WaveColor) WaveColor = dp.SrcProperty.WaveColor;
if (WaveSource != dp.SrcProperty.WaveSource) WaveSource = dp.SrcProperty.WaveSource;
if (AxisMode != dp.SrcProperty.AxisMode) AxisMode = dp.SrcProperty.AxisMode;
+
if (WaveLength != dp.SrcProperty.WaveLength) WaveLength = dp.SrcProperty.WaveLength;
if (WaveSource == WaveSource.Xray)
{
@@ -3044,6 +3046,17 @@ public void AddProfileToCheckedListBox(DiffractionProfile2 dp, bool isCheked, bo
if (TakeoffAngle != dp.SrcProperty.EnergyTakeoffAngle) TakeoffAngle = dp.SrcProperty.EnergyTakeoffAngle;
if (TofAngle != dp.SrcProperty.TofAngle) TofAngle = dp.SrcProperty.TofAngle;
if (TofLength != dp.SrcProperty.TofLength) TofLength = dp.SrcProperty.TofLength;
+
+ if (AxisMode == HorizontalAxis.d && horizontalAxisUserControl.DspacingUnit != dp.SrcProperty.DspacingUnit)
+ horizontalAxisUserControl.DspacingUnit = dp.SrcProperty.DspacingUnit;
+ if (AxisMode == HorizontalAxis.EnergyXray || AxisMode == HorizontalAxis.EnergyElectron || AxisMode== HorizontalAxis.EnergyNeutron )
+ if(horizontalAxisUserControl.EnergyUnit != dp.SrcProperty.EnergyUnit)
+ horizontalAxisUserControl.EnergyUnit = dp.SrcProperty.EnergyUnit;
+
+ if(AxisMode== HorizontalAxis.Angle && horizontalAxisUserControl.TwoThetaUnit != dp.SrcProperty.TwoThetaUnit)
+ horizontalAxisUserControl.TwoThetaUnit = dp.SrcProperty.TwoThetaUnit;
+ if (AxisMode == HorizontalAxis.WaveNumber && horizontalAxisUserControl.WaveNumberUnit != dp.SrcProperty.WaveNumberUnit)
+ horizontalAxisUserControl.WaveNumberUnit = dp.SrcProperty.WaveNumberUnit;
}
dp.SetConvertedProfile(HorizontalAxisProperty);
diff --git a/PDIndexer/PDIndexer.csproj b/PDIndexer/PDIndexer.csproj
index f07d3c8..9496a58 100644
--- a/PDIndexer/PDIndexer.csproj
+++ b/PDIndexer/PDIndexer.csproj
@@ -4,8 +4,8 @@
WinExe
net8.0-windows10.0.22621.0
true
- 2023.11.27.1026
- 2023.11.27.1026
+ 2023.11.27.1147
+ 2023.11.27.1147
App.ico
7.0
diff --git a/PDIndexer/Version.cs b/PDIndexer/Version.cs
index 26de9dd..69573cc 100644
--- a/PDIndexer/Version.cs
+++ b/PDIndexer/Version.cs
@@ -11,6 +11,7 @@ static class Version
///
public const string History =
"History" +
+ "\r\n ver4.442(2023/11/27) The target framework has been changed to .Net Desktop Runtime 8.0. Fixed a minor bug (thx to Okazaki-san)." +
"\r\n ver4.442(2023/10/07) Update crystal database. Fixed minor bugs." +
"\r\n ver4.441(2023/07/01) Fixed a bug on loading *.pdi2 format files." +
"\r\n ver4.440(2023/05/24) Improved registry read/write.The registry is cleared the first time this version is launched." +
diff --git a/REQUIREMENT.rtf b/REQUIREMENT.rtf
index bc83d45..fee7fdf 100644
--- a/REQUIREMENT.rtf
+++ b/REQUIREMENT.rtf
@@ -42,12 +42,12 @@
\af0\afs22\alang1025 \ltrch\fcs0 \fs21\lang1033\langfe1041\kerning2\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 \sbasedon0 \snext17 \slink18 \sunhideused \styrsid11501207 footer;}{\*\cs18 \additive \rtlch\fcs1 \af0\afs22
\ltrch\fcs0 \fs22 \sbasedon10 \slink17 \slocked \styrsid11501207 \'83\'74\'83\'62\'83\'5e\'81\'5b (\'95\'b6\'8e\'9a);}{\*\cs19 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf19 \sbasedon10 \sunhideused \styrsid1574504 Hyperlink;}{\*\cs20 \additive
\rtlch\fcs1 \af0 \ltrch\fcs0 \cf20\chshdng0\chcfpat0\chcbpat21 \sbasedon10 \ssemihidden \sunhideused \styrsid1574504 Unresolved Mention;}}{\*\rsidtbl \rsid554805\rsid596452\rsid1574504\rsid3036261\rsid3225627\rsid3428307\rsid5378641\rsid6323857
-\rsid6830512\rsid7764380\rsid9331515\rsid9445046\rsid9509333\rsid10319044\rsid10880573\rsid11501207\rsid12674628\rsid13517195\rsid15163948\rsid15271945\rsid15402160\rsid15826899}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0
-\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Seto Yusuke}{\operator Seto Yusuke}{\creatim\yr2020\mo3\dy3\hr14\min55}{\revtim\yr2022\mo11\dy16\hr12\min56}{\version14}{\edmins14}{\nofpages1}{\nofwords31}{\nofchars181}{\nofcharsws211}
-{\vern59}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1701\margr1701\margt1985\margb1701\gutter0\ltrsect
+\rsid6830512\rsid7764380\rsid9331515\rsid9445046\rsid9509333\rsid10059180\rsid10319044\rsid10880573\rsid11501207\rsid12674628\rsid13517195\rsid15163948\rsid15271945\rsid15402160\rsid15826899\rsid16087347}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0
+\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Seto Yusuke}{\operator SETO Yusuke}{\creatim\yr2020\mo3\dy3\hr14\min55}{\revtim\yr2023\mo11\dy27\hr21}{\version15}{\edmins14}{\nofpages1}{\nofwords31}
+{\nofchars177}{\nofcharsws207}{\vern83}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1701\margr1701\margt1985\margb1701\gutter0\ltrsect
\deftab840\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml1\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\formshade\horzdoc\dgmargin\dghspace180\dgvspace180
\dghorigin1701\dgvorigin1985\dghshow0\dgvshow2\jcompress\lnongrid
-\viewkind1\viewscale130\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot9331515\newtblstyruls
+\viewkind1\viewscale190\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot9331515\newtblstyruls
\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat {\upr{\*\fchars
!%),.:\'3b?]\'7d\'81\'91\'81\'8b\'81\'66\'81\'68\'81\'f1\'81\'8c\'81\'8d\'81\'8e\'81\'41\'81\'42\'81\'58\'81\'72\'81\'74\'81\'76\'81\'78\'81\'7a\'81\'6c\'81\'4a\'81\'4b\'81\'54\'81\'55\'81\'45\'81\'52\'81\'53\'81\'49\'81\'93\'81\'6a\'81\'43\'81\'44\'81\'46\'81\'47\'81\'48\'81\'6e\'81\'70\'a1\'a3\'a4\'a5\'de\'df\'81\'91
}{\*\ud\uc0{\*\fchars
@@ -56,23 +56,24 @@
$([\'5c\'7b{\uc2\u163 \'81\'92}{\uc1\u165 \'5c\'81e\'81g\'81q\'81s\'81u\'81w\'81y\'81k\'81\'90\'81i\'81m\'81o\'a2\'81\'92\'81\'8f}}}}\fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0
{\*\docvar {__Grammarly_42____i}{H4sIAAAAAAAEAKtWckksSQxILCpxzi/NK1GyMqwFAAEhoTITAAAA}}{\*\docvar {__Grammarly_42___1}{H4sIAAAAAAAEAKtWcslP9kxRslIyNDayNLEwNrAwNDIyNrYwNDFU0lEKTi0uzszPAykwrQUA3tsoyywAAAA=}}{\*\ftnsep \ltrpar \pard\plain \ltrpar
\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11501207 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {
-\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15402160 \chftnsep
+\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10059180 \chftnsep
\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11501207 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
-\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15402160 \chftnsepc
+\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10059180 \chftnsepc
\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11501207 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
-\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15402160 \chftnsep
+\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10059180 \chftnsep
\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid11501207 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
-\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15402160 \chftnsepc
+\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10059180 \chftnsepc
\par }}\ltrpar \sectd \ltrsect\linex0\headery851\footery992\colsx425\endnhere\sectlinegrid360\sectspecifyl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta \dbch .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta \dbch .}}
{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta \dbch .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta \dbch )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl6
\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl9
-\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9331515 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
-\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \ab\af0\afs21 \ltrch\fcs0 \b\f0\cf22\insrsid1574504\charrsid554805 \hich\af0\dbch\af31505\loch\f0 .NET Desktop Runtime 7.0}{\rtlch\fcs1
-\af0\afs21 \ltrch\fcs0 \f0\insrsid1574504\charrsid554805 \hich\af0\dbch\af31505\loch\f0 (not .NET Runtime 7.0) is required}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid15271945\charrsid554805 \hich\af0\dbch\af31505\loch\f0 t
-\hich\af0\dbch\af31505\loch\f0 o run this }{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid9445046\charrsid554805 \hich\af0\dbch\af31505\loch\f0 application and}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid7764380\charrsid554805
-\hich\af0\dbch\af31505\loch\f0 can be installed from the following page.}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid1574504\charrsid554805
-\par }{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\ul\cf23\insrsid1574504\charrsid554805 \hich\af0\dbch\af31505\loch\f0 https://dotnet.microsoft.com/download/dotnet/7.0}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid15826899\charrsid554805
-\hich\af0\dbch\af31505\loch\f0 (copy and paste to your browser)}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid1574504\charrsid554805
+\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid16087347 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
+\fs21\lang1033\langfe1041\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1041 {\rtlch\fcs1 \ab\af0\afs21 \ltrch\fcs0 \b\f0\cf22\insrsid16087347\charrsid554805 \hich\af0\dbch\af31505\loch\f0 .NET Desktop Runtime }{\rtlch\fcs1
+\ab\af0\afs21 \ltrch\fcs0 \b\f0\cf22\insrsid16087347 \hich\af0\dbch\af31505\loch\f0 8}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid16087347\charrsid554805 \hich\af0\dbch\af31505\loch\f0 (not .NET Runtime }{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0
+\f0\insrsid16087347 \hich\af0\dbch\af31505\loch\f0 8}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid16087347\charrsid554805 \hich\af0\dbch\af31505\loch\f0 ) is required\hich\af0\dbch\af31505\loch\f0 to run this \hich\af0\dbch\af31505\loch\f0
+application and\hich\af0\dbch\af31505\loch\f0 can be installed from the following page.
+\par }{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\ul\cf23\insrsid16087347\charrsid554805 \hich\af0\dbch\af31505\loch\f0 https://dotnet.microsoft.com/download/dotnet/}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\ul\cf23\insrsid16087347 \hich\af0\dbch\af31505\loch\f0 8}{
+\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\ul\cf23\insrsid16087347\charrsid554805 .0}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0 \f0\insrsid16087347\charrsid554805 \hich\af0\dbch\af31505\loch\f0 (copy and paste to your browser)}{\rtlch\fcs1 \af0\afs21 \ltrch\fcs0
+\f0\insrsid1574504\charrsid554805
\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
@@ -214,8 +215,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000a0a2
-e1746ff9d801feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000e0e0
+174c2921da01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file