Update template projects with latest NuGets (#633)

2021-07-01 17:15:33 +01:00 · 2021-07-01 17:15:33 +01:00 · 0ee327c95e
--- a/CSharp.BlankApplication/CSharp.BlankApplication-vs2017.vstemplate
+++ b/CSharp.BlankApplication/CSharp.BlankApplication-vs2017.vstemplate
@ -24,7 +24,7 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="47973986-ed3c-4b64-ba40-a9da73b44ef7">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18"/>
    </packages>
  </WizardData>
 </VSTemplate>
--- a/CSharp.BlankApplication/CSharp.BlankApplication.vstemplate
+++ b/CSharp.BlankApplication/CSharp.BlankApplication.vstemplate
@ -24,7 +24,7 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="455f2be5-bb07-451e-b351-a9faf3018dc9">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18"/>
    </packages>
  </WizardData>
 </VSTemplate>
--- a/CSharp.ClassLibrary/CSharp.ClassLibrary-vs2017.vstemplate
+++ b/CSharp.ClassLibrary/CSharp.ClassLibrary-vs2017.vstemplate
@ -24,7 +24,7 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="47973986-ed3c-4b64-ba40-a9da73b44ef7">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20" />
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18" />
    </packages>    
  </WizardData>
 </VSTemplate>
--- a/CSharp.ClassLibrary/CSharp.ClassLibrary.vstemplate
+++ b/CSharp.ClassLibrary/CSharp.ClassLibrary.vstemplate
@ -24,7 +24,7 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="455f2be5-bb07-451e-b351-a9faf3018dc9">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20" />
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18" />
    </packages>    
  </WizardData>
 </VSTemplate>
--- a/CSharp.TestApplication/CSharp.TestApplication-vs2017.vstemplate
+++ b/CSharp.TestApplication/CSharp.TestApplication-vs2017.vstemplate
@ -24,8 +24,8 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="47973986-ed3c-4b64-ba40-a9da73b44ef7">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
-      <package id="nanoFramework.TestFramework" version="1.0.110"/>
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18"/>
+      <package id="nanoFramework.TestFramework" version="1.0.141"/>
    </packages>
  </WizardData>
 </VSTemplate>
--- a/CSharp.TestApplication/CSharp.TestApplication.vstemplate
+++ b/CSharp.TestApplication/CSharp.TestApplication.vstemplate
@ -24,8 +24,8 @@
  </WizardExtension>
  <WizardData>
    <packages repository="extension" repositoryId="455f2be5-bb07-451e-b351-a9faf3018dc9">
-      <package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
-      <package id="nanoFramework.TestFramework" version="1.0.110"/>
+      <package id="nanoFramework.CoreLibrary" version="1.10.5-preview.18"/>
+      <package id="nanoFramework.TestFramework" version="1.0.141"/>
    </packages>
  </WizardData>
 </VSTemplate>
--- a/CSharp.TestApplication/NFUnitTest.nfproj
+++ b/CSharp.TestApplication/NFUnitTest.nfproj
@ -32,7 +32,7 @@
 	</ItemGroup>
  <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
  <!-- MANUAL UPDATE HERE -->
-  <Import Project="..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets')" />
+  <Import Project="..\packages\nanoFramework.TestFramework.1.0.141\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.1.0.141\build\nanoFramework.TestFramework.targets')" />
  <ProjectExtensions>
    <ProjectCapabilities>
      <ProjectConfigurationsDeclaredAsItems/>
@ -42,6 +42,6 @@
    <PropertyGroup>
      <WarningText>Update the Import path in nfproj to the correct nanoFramework.TestFramework NuGet package folder.</WarningText>
    </PropertyGroup>
-    <Warning Condition="!Exists('..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
+    <Warning Condition="!Exists('..\packages\nanoFramework.TestFramework.1.0.141\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
  </Target>
 </Project>
--- a/VisualStudio.Extension-2019/VisualStudio.Extension.csproj
+++ b/VisualStudio.Extension-2019/VisualStudio.Extension.csproj
@ -339,13 +339,13 @@
    <Compile Include="AutomaticUpdates\UpdateManager.cs" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="$(PkgnanoFramework_CoreLibrary)\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg">
-      <Link>Packages\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg</Link>
+    <Content Include="$(PkgnanoFramework_CoreLibrary)\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg">
+      <Link>Packages\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
-    <Content Include="$(PkgnanoFramework_TestFramework)\nanoFramework.TestFramework.1.0.110.nupkg">
-      <Link>Packages\nanoFramework.TestFramework.1.0.110.nupkg</Link>
+    <Content Include="$(PkgnanoFramework_TestFramework)\nanoFramework.TestFramework.1.0.141.nupkg">
+      <Link>Packages\nanoFramework.TestFramework.1.0.141.nupkg</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
@ -768,11 +768,11 @@
      <Version>5.4.1.1</Version>
    </PackageReference>
    <PackageReference Include="nanoFramework.CoreLibrary" GeneratePathProperty="true">
-      <Version>1.10.3-preview.20</Version>
+      <Version>1.10.5-preview.18</Version>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="nanoFramework.TestFramework" GeneratePathProperty="true">
-      <Version>1.0.110</Version>
+      <Version>1.0.141</Version>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.0.0-preview.28" />
--- a/VisualStudio.Extension-2019/packages.lock.json
+++ b/VisualStudio.Extension-2019/packages.lock.json
@ -302,15 +302,15 @@
      },
      "nanoFramework.CoreLibrary": {
        "type": "Direct",
-        "requested": "[1.10.3-preview.20, )",
-        "resolved": "1.10.3-preview.20",
-        "contentHash": "soWJe4FdBCgq9aXfIyqSFFBQBisV31QDJjoN+9GDculaLw4g4jsdSh333ETPLdeFg0E2u5aqtZF81jZ7QsYj4g=="
+        "requested": "[1.10.5-preview.18, )",
+        "resolved": "1.10.5-preview.18",
+        "contentHash": "gfHYalT/syk+AU32Oq/99HxX/QBqsJ3Js5PWlkmm/qWfVKWmh/2UxpfAFVIceGs8z+NwRrngvkMUezLyUMlxng=="
      },
      "nanoFramework.TestFramework": {
        "type": "Direct",
-        "requested": "[1.0.110, )",
-        "resolved": "1.0.110",
-        "contentHash": "O5G7VssTCvTeCqpavCc2xploPHg63y4P3VH9rSvcbfP0InnJXcqbBDBvNB/XSm48agEjSkArcugfJ9lnuY2CAg=="
+        "requested": "[1.0.141, )",
+        "resolved": "1.0.141",
+        "contentHash": "kO+52oUmGPIkaFiot6+BZJNo6zTYz+Q7oYmYCFRycnLD2JpjlAbmQ7kkh1Cio7UaeB0z44TeytkPbBKDHrhFPQ=="
      },
      "nanoFramework.Tools.Debugger.Net": {
        "type": "Direct",
--- a/VisualStudio.Extension-2019/source.extension.vsixmanifest
+++ b/VisualStudio.Extension-2019/source.extension.vsixmanifest
@ -31,7 +31,7 @@
        <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="CSharp.ClassTemplate" d:TargetPath="|CSharp.ClassTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
        <Asset Type="Microsoft.VisualStudio.ResourceTemplate" d:Source="Project" d:ProjectName="CSharp.ResourceTemplate" d:TargetPath="|CSharp.ResourceTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharp.TestApplication" d:TargetPath="|CSharp.TestApplication;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-        <Asset Type="nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg" d:VsixSubPath="Packages" />
-        <Asset Type="nanoFramework.TestFramework.1.0.110.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.110.nupkg" d:VsixSubPath="Packages" />
+        <Asset Type="nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg" d:VsixSubPath="Packages" />
+        <Asset Type="nanoFramework.TestFramework.1.0.141.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.141.nupkg" d:VsixSubPath="Packages" />
    </Assets>
 </PackageManifest>
--- a/VisualStudio.Extension/VisualStudio.Extension.csproj
+++ b/VisualStudio.Extension/VisualStudio.Extension.csproj
@ -191,13 +191,13 @@
  </ItemGroup>
  <ItemGroup>
    <!-- GeneratePathProperty doesn't work on VS2017, so need to add this workaround -->
-    <Content Include="$(NuGetPackageRoot)\nanoframework.corelibrary\1.10.3-preview.20\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg">
-      <Link>Packages\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg</Link>
+    <Content Include="$(NuGetPackageRoot)\nanoframework.corelibrary\1.10.5-preview.18\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg">
+      <Link>Packages\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
-    <Content Include="$(NuGetPackageRoot)\nanoFramework.TestFramework\1.0.110\nanoFramework.TestFramework.1.0.110.nupkg">
-      <Link>Packages\nanoFramework.TestFramework.1.0.110.nupkg</Link>
+    <Content Include="$(NuGetPackageRoot)\nanoFramework.TestFramework\1.0.141\nanoFramework.TestFramework.1.0.141.nupkg">
+      <Link>Packages\nanoFramework.TestFramework.1.0.141.nupkg</Link>
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
@ -658,10 +658,10 @@
      <Version>5.4.1.1</Version>
    </PackageReference>
    <PackageReference Include="nanoFramework.CoreLibrary">
-      <Version>1.10.3-preview.20</Version>
+      <Version>1.10.5-preview.18</Version>
    </PackageReference>
    <PackageReference Include="nanoFramework.TestFramework">
-      <Version>1.0.110</Version>
+      <Version>1.0.141</Version>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
--- a/VisualStudio.Extension/packages.lock.json
+++ b/VisualStudio.Extension/packages.lock.json
@ -258,15 +258,15 @@
      },
      "nanoFramework.CoreLibrary": {
        "type": "Direct",
-        "requested": "[1.10.3-preview.20, )",
-        "resolved": "1.10.3-preview.20",
-        "contentHash": "soWJe4FdBCgq9aXfIyqSFFBQBisV31QDJjoN+9GDculaLw4g4jsdSh333ETPLdeFg0E2u5aqtZF81jZ7QsYj4g=="
+        "requested": "[1.10.5-preview.18, )",
+        "resolved": "1.10.5-preview.18",
+        "contentHash": "gfHYalT/syk+AU32Oq/99HxX/QBqsJ3Js5PWlkmm/qWfVKWmh/2UxpfAFVIceGs8z+NwRrngvkMUezLyUMlxng=="
      },
      "nanoFramework.TestFramework": {
        "type": "Direct",
-        "requested": "[1.0.110, )",
-        "resolved": "1.0.110",
-        "contentHash": "O5G7VssTCvTeCqpavCc2xploPHg63y4P3VH9rSvcbfP0InnJXcqbBDBvNB/XSm48agEjSkArcugfJ9lnuY2CAg=="
+        "requested": "[1.0.141, )",
+        "resolved": "1.0.141",
+        "contentHash": "kO+52oUmGPIkaFiot6+BZJNo6zTYz+Q7oYmYCFRycnLD2JpjlAbmQ7kkh1Cio7UaeB0z44TeytkPbBKDHrhFPQ=="
      },
      "nanoFramework.Tools.Debugger.Net": {
        "type": "Direct",
--- a/VisualStudio.Extension/source.extension.vsixmanifest
+++ b/VisualStudio.Extension/source.extension.vsixmanifest
@ -27,8 +27,8 @@
    <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="CSharp.ClassTemplate" d:TargetPath="|CSharp.ClassTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
    <Asset Type="Microsoft.VisualStudio.ResourceTemplate" d:Source="Project" d:ProjectName="CSharp.ResourceTemplate" d:TargetPath="|CSharp.ResourceTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
    <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="CSharp.TestApplication" d:TargetPath="|CSharp.TestApplication;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
-    <Asset Type="nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg" d:VsixSubPath="Packages" />
-    <Asset Type="nanoFramework.TestFramework.1.0.110.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.110.nupkg" d:VsixSubPath="Packages" />
+    <Asset Type="nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.5-preview.18.nupkg" d:VsixSubPath="Packages" />
+    <Asset Type="nanoFramework.TestFramework.1.0.141.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.141.nupkg" d:VsixSubPath="Packages" />
    <Asset Type="Microsoft.VisualStudio.ToolboxControl" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
  </Assets>
  <Prerequisites>