This commit is contained in:
José Simões 2021-05-07 17:07:52 +01:00 коммит произвёл GitHub
Родитель d4a59be00f
Коммит 790dfeb2fe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 49 добавлений и 65 удалений

Просмотреть файл

@ -71,14 +71,6 @@
<ItemGroup>
<Content Include="CSAssemblyInfoFile.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
<Version>15.8.36</Version>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
<Version>15.8.209</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' AND Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Просмотреть файл

@ -24,7 +24,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="47973986-ed3c-4b64-ba40-a9da73b44ef7">
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.7"/>
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
</packages>
</WizardData>
</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.7"/>
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
</packages>
</WizardData>
</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.7" />
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20" />
</packages>
</WizardData>
</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.7" />
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20" />
</packages>
</WizardData>
</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.7"/>
<package id="nanoFramework.TestFramework" version="1.0.98"/>
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
<package id="nanoFramework.TestFramework" version="1.0.110"/>
</packages>
</WizardData>
</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.7"/>
<package id="nanoFramework.TestFramework" version="1.0.98"/>
<package id="nanoFramework.CoreLibrary" version="1.10.3-preview.20"/>
<package id="nanoFramework.TestFramework" version="1.0.110"/>
</packages>
</WizardData>
</VSTemplate>

Просмотреть файл

@ -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.98\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.1.0.98\build\nanoFramework.TestFramework.targets')" />
<Import Project="..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets" Condition="Exists('..\packages\nanoFramework.TestFramework.1.0.110\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.98\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
<Warning Condition="!Exists('..\packages\nanoFramework.TestFramework.1.0.110\build\nanoFramework.TestFramework.targets')" Text="'$(WarningText)'" />
</Target>
</Project>

Просмотреть файл

@ -82,7 +82,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning">
<Version>3.3.37</Version>
<Version>3.4.194</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Просмотреть файл

@ -339,13 +339,13 @@
<Compile Include="AutomaticUpdates\UpdateManager.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="$(PkgnanoFramework_CoreLibrary)\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg">
<Link>Packages\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg</Link>
<Content Include="$(PkgnanoFramework_CoreLibrary)\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg">
<Link>Packages\nanoFramework.CoreLibrary.1.10.3-preview.20.nupkg</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(PkgnanoFramework_TestFramework)\nanoFramework.TestFramework.1.0.98.nupkg">
<Link>Packages\nanoFramework.TestFramework.1.0.98.nupkg</Link>
<Content Include="$(PkgnanoFramework_TestFramework)\nanoFramework.TestFramework.1.0.110.nupkg">
<Link>Packages\nanoFramework.TestFramework.1.0.110.nupkg</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
@ -785,18 +785,18 @@
<Version>5.4.1.1</Version>
</PackageReference>
<PackageReference Include="nanoFramework.CoreLibrary" GeneratePathProperty="true">
<Version>1.10.3-preview.7</Version>
<Version>1.10.3-preview.20</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nanoFramework.TestFramework" GeneratePathProperty="true">
<Version>1.0.98</Version>
<Version>1.0.110</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nanoFramework.Tools.Debugger.Net" Version="2.0.0-preview.3" />
<PackageReference Include="nanoFramework.Tools.MetadataProcessor.Core" Version="2.31.3" />
<PackageReference Include="nanoFramework.Tools.MetadataProcessor.MsBuildTask" Version="2.34.4" />
<PackageReference Include="Nerdbank.GitVersioning">
<Version>3.3.37</Version>
<Version>3.4.194</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
@ -804,7 +804,7 @@
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NuGet.VisualStudio">
<Version>5.9.0</Version>
<Version>5.9.1</Version>
</PackageReference>
<PackageReference Include="PropertyChanging.Fody">
<Version>1.29.3</Version>

Просмотреть файл

@ -302,15 +302,15 @@
},
"nanoFramework.CoreLibrary": {
"type": "Direct",
"requested": "[1.10.3-preview.7, )",
"resolved": "1.10.3-preview.7",
"contentHash": "zhHvkrLLIdbqo4YVhG/oQ7lNpI/xInjNQnIMFX3m0heGnfELFMffb7z5pHL+YcZ995jqPzMJjK+M2EkossjE5A=="
"requested": "[1.10.3-preview.20, )",
"resolved": "1.10.3-preview.20",
"contentHash": "soWJe4FdBCgq9aXfIyqSFFBQBisV31QDJjoN+9GDculaLw4g4jsdSh333ETPLdeFg0E2u5aqtZF81jZ7QsYj4g=="
},
"nanoFramework.TestFramework": {
"type": "Direct",
"requested": "[1.0.98, )",
"resolved": "1.0.98",
"contentHash": "vb16eJaxeGmLvbfYqOGsJm725zK91GTXcPwODcKosnuMXnWadXwGggaovjCWclpyxGQ2RY0GZ114o+gZ47cx2w=="
"requested": "[1.0.110, )",
"resolved": "1.0.110",
"contentHash": "O5G7VssTCvTeCqpavCc2xploPHg63y4P3VH9rSvcbfP0InnJXcqbBDBvNB/XSm48agEjSkArcugfJ9lnuY2CAg=="
},
"nanoFramework.Tools.Debugger.Net": {
"type": "Direct",
@ -348,9 +348,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.3.37, )",
"resolved": "3.3.37",
"contentHash": "YlDKV/gSHQGDThWSGqVyPfKeNP/kx1fj/NPFFgGc/cxzgIbXv4jtYOcbFOz3ZIeAKtpCcSAmVNDOikBs3OxI/A=="
"requested": "[3.4.194, )",
"resolved": "3.4.194",
"contentHash": "f4V2lLy9G0BnddqGhfaVa+dKsbu8iCiLiUARHKBo0l899MgJdRjVU2C7e29gHrZWxc2HZkq3aq28OHHK7q0/iQ=="
},
"Newtonsoft.Json": {
"type": "Direct",
@ -360,9 +360,9 @@
},
"NuGet.VisualStudio": {
"type": "Direct",
"requested": "[5.9.0, )",
"resolved": "5.9.0",
"contentHash": "MG9M62PdzCPkU0oeRbPukQbcVsaKwg/I7QbIMUF/SXsbdZc/LT3n0k9ie5msV+AOtnF05EjesYW5UXbPau08qQ==",
"requested": "[5.9.1, )",
"resolved": "5.9.1",
"contentHash": "JkxAuAyzneH2VYdhVrbZmNPK0NpJX3WKn3qCHjI2yOWM+MKnqqR10mavkfFvOD/J58pAzYqu15RDZah8GrE62g==",
"dependencies": {
"VSSDK.TemplateWizardInterface": "12.0.4"
}
@ -2264,11 +2264,7 @@
}
},
"csharp.assemblyinfotemplate": {
"type": "Project",
"dependencies": {
"Microsoft.VisualStudio.SDK.Analyzers": "15.8.36",
"Microsoft.VisualStudio.Threading.Analyzers": "15.8.209"
}
"type": "Project"
},
"csharp.blankapplication": {
"type": "Project"

Просмотреть файл

@ -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.7.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg" d:VsixSubPath="Packages" />
<Asset Type="nanoFramework.TestFramework.1.0.98.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.98.nupkg" d:VsixSubPath="Packages" />
<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" />
</Assets>
</PackageManifest>

Просмотреть файл

@ -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.7\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg">
<Link>Packages\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg</Link>
<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>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="$(NuGetPackageRoot)\nanoFramework.TestFramework\1.0.98\nanoFramework.TestFramework.1.0.98.nupkg">
<Link>Packages\nanoFramework.TestFramework.1.0.98.nupkg</Link>
<Content Include="$(NuGetPackageRoot)\nanoFramework.TestFramework\1.0.110\nanoFramework.TestFramework.1.0.110.nupkg">
<Link>Packages\nanoFramework.TestFramework.1.0.110.nupkg</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
@ -661,10 +661,10 @@
<Version>5.4.1.1</Version>
</PackageReference>
<PackageReference Include="nanoFramework.CoreLibrary">
<Version>1.10.3-preview.7</Version>
<Version>1.10.3-preview.20</Version>
</PackageReference>
<PackageReference Include="nanoFramework.TestFramework">
<Version>1.0.98</Version>
<Version>1.0.110</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Просмотреть файл

@ -268,15 +268,15 @@
},
"nanoFramework.CoreLibrary": {
"type": "Direct",
"requested": "[1.10.3-preview.7, )",
"resolved": "1.10.3-preview.7",
"contentHash": "zhHvkrLLIdbqo4YVhG/oQ7lNpI/xInjNQnIMFX3m0heGnfELFMffb7z5pHL+YcZ995jqPzMJjK+M2EkossjE5A=="
"requested": "[1.10.3-preview.20, )",
"resolved": "1.10.3-preview.20",
"contentHash": "soWJe4FdBCgq9aXfIyqSFFBQBisV31QDJjoN+9GDculaLw4g4jsdSh333ETPLdeFg0E2u5aqtZF81jZ7QsYj4g=="
},
"nanoFramework.TestFramework": {
"type": "Direct",
"requested": "[1.0.98, )",
"resolved": "1.0.98",
"contentHash": "vb16eJaxeGmLvbfYqOGsJm725zK91GTXcPwODcKosnuMXnWadXwGggaovjCWclpyxGQ2RY0GZ114o+gZ47cx2w=="
"requested": "[1.0.110, )",
"resolved": "1.0.110",
"contentHash": "O5G7VssTCvTeCqpavCc2xploPHg63y4P3VH9rSvcbfP0InnJXcqbBDBvNB/XSm48agEjSkArcugfJ9lnuY2CAg=="
},
"nanoFramework.Tools.Debugger.Net": {
"type": "Direct",
@ -1157,11 +1157,7 @@
}
},
"csharp.assemblyinfotemplate": {
"type": "Project",
"dependencies": {
"Microsoft.VisualStudio.SDK.Analyzers": "15.8.36",
"Microsoft.VisualStudio.Threading.Analyzers": "15.8.209"
}
"type": "Project"
},
"csharp.blankapplication": {
"type": "Project"

Просмотреть файл

@ -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.7.nupkg" d:Source="File" Path="Packages\nanoFramework.CoreLibrary.1.10.3-preview.7.nupkg" d:VsixSubPath="Packages" />
<Asset Type="nanoFramework.TestFramework.1.0.98.nupkg" d:Source="File" Path="Packages\nanoFramework.TestFramework.1.0.98.nupkg" d:VsixSubPath="Packages" />
<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="Microsoft.VisualStudio.ToolboxControl" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Prerequisites>