Updated to a few stable versions of dependencies.
This commit is contained in:
Коммит
2290498bbe
|
@ -7,7 +7,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Condition="'$(IsNativeProject)'!='true'" Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="all"/>
|
||||
<PackageReference Condition="'$(IsNativeProject)'!='true'" Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" PrivateAssets="analyzers"/>
|
||||
<PackageReference Condition="'$(IsNativeProject)'!='true'" Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" PrivateAssets="analyzers"/>
|
||||
</ItemGroup>
|
||||
</When>
|
||||
</Choose>
|
||||
|
|
|
@ -160,13 +160,13 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
|
||||
<Version>6.2.8</Version>
|
||||
<Version>6.2.9</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.UI.Xaml">
|
||||
<Version>2.2.190416008-prerelease</Version>
|
||||
<Version>2.2.190917002</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts">
|
||||
<Version>10.0.18362.2002-preview</Version>
|
||||
<Version>10.0.18362.2005</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -179,5 +179,5 @@
|
|||
<VisualStudioVersion>14.0</VisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
|
||||
<Target Name="Pack"/>
|
||||
<Target Name="Pack" />
|
||||
</Project>
|
|
@ -48,7 +48,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.0-rc">
|
||||
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc">
|
||||
<PrivateAssets>analyzers</PrivateAssets>
|
||||
</PackageReference>
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Win32.UI.XamlApplication.Package\Microsoft.Toolkit.Win32.UI.XamlApplication.Package.csproj">
|
||||
|
|
|
@ -8,7 +8,10 @@
|
|||
<!-- Up-to-date check fails for Xaml Islands projects: -->
|
||||
<!-- https://github.com/dotnet/project-system/issues/5543 -->
|
||||
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(DesignTimeBuild)' == 'true'">
|
||||
<_DisableAppxCopy>true</_DisableAppxCopy>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
@ -21,7 +24,7 @@
|
|||
<IntDir>$(BaseIntermediateOutputPath)\$(Platform)\$(Configuration)\$(TargetFramework)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.0-rc" />
|
||||
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.2-rc" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="_GetUWPAppPayload">
|
||||
|
@ -60,7 +63,8 @@
|
|||
<Target Name="CopyAllProjectReferencesOutputs"
|
||||
DependsOnTargets="_GetUWPAppPayload;ResolveReferences"
|
||||
Inputs="@(_AppxInputs)"
|
||||
Outputs="@(_AppxInputs->'%(FinalTargetPath)')">
|
||||
Outputs="@(_AppxInputs->'%(FinalTargetPath)')"
|
||||
Condition="'$(_DisableAppxCopy)'==''">
|
||||
|
||||
<CreateItem Include="%(_AppxBuildOutputPaths.Identity)" Condition="'%(_AppxBuildOutputPaths.TargetPath)'!=''" AdditionalMetadata="Link=%(_AppxBuildOutputPaths.TargetPath)">
|
||||
<Output ItemName="_AppxBuildOutputs" TaskParameter="Include"/>
|
||||
|
@ -188,7 +192,8 @@
|
|||
AfterTargets="ResolveReferences"
|
||||
DependsOnTargets="CopyAllProjectReferencesOutputs"
|
||||
Inputs="@(AppxManifest);$(ApplicationManifest)"
|
||||
Outputs="$(MergedApplicationManifest)">
|
||||
Outputs="$(MergedApplicationManifest)"
|
||||
Condition="'$(_DisableAppxCopy)'==''">
|
||||
<MakeDir Directories="$(IntDir)\Manifests\" />
|
||||
<GenerateWinRTManifestFromAppx AppxManifest="@(AppxManifest)" DestinationFolder="$(IntDir)\Manifests\" />
|
||||
<CreateItem Include="$(IntDir)Manifests\*.manifest">
|
||||
|
|
|
@ -23,7 +23,7 @@ steps:
|
|||
- task: UseDotNet@2
|
||||
inputs:
|
||||
packageType: 'sdk'
|
||||
version: '3.0.100-rc1-014190'
|
||||
version: '3.0.100'
|
||||
displayName: Use .NET Core sdk
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "3.0.100-rc1-014190"
|
||||
}
|
||||
}
|
Загрузка…
Ссылка в новой задаче