Skip to content

Remove requirements for VS 16.7 #24713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure/pipelines/jobs/codesign-xplat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- powershell: .\eng\common\build.ps1
-ci
-nobl
-msbuildEngine dotnet
-restore
-sign
-publish
Expand Down
2 changes: 1 addition & 1 deletion .azure/pipelines/jobs/default-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019.Pre
queue: BuildPool.Server.Amd64.VS2019
${{ if ne(parameters.container, '') }}:
container: ${{ parameters.container }}
variables:
Expand Down
12 changes: 7 additions & 5 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
</ItemGroup>

<Target Name="_PublishInstallersAndChecksums">
<!--
This target is defined in eng/targets/Packaging.targets and included in every C# and F# project.
We use Microsoft.AspNetCore.DeveloperCertificates.XPlat because it is a nonshipping package, and we need a non-stable version string to use as our publish location.
If Microsoft.AspNetCore.DeveloperCertificates.XPlat ever becomes a shipping package, this logic will break, so be careful
<!--
This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
and npm project. We use SignalR.Npm.FunctionalTests.npmproj because it is non-shipping (we need a non-stable
version string to use as our publish location), non-packed (won't be shipped in the future), and it is _not_ a
C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
-->
<MSBuild Projects="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj"
<MSBuild Projects="$(RepoRoot)src\SignalR\clients\ts\FunctionalTests\SignalR.Npm.FunctionalTests.npmproj"
Properties="DisableYarnCheck=true"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
Expand Down
15 changes: 14 additions & 1 deletion eng/targets/Npm.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<BuildOutputFiles Include="dist\**\*.js" />
</ItemGroup>

<Target Name="_CheckForInvalidConfiguration">
<Target Name="_CheckForInvalidConfiguration" Condition=" '$(DisableYarnCheck)' != 'true' ">
<Error Text="Missing expected property: PackageId" Condition="'$(IsPackable)' != 'false' and '$(PackageId)' == ''" />

<Exec ContinueOnError="true" Command="node -v" StandardOutputImportance="Low">
Expand Down Expand Up @@ -115,6 +115,19 @@

<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)" />

<!-- This target is used to get the package versions of projects. A variant also exists in Packaging.targets. -->
<Target Name="_GetPackageVersionInfo" Returns="@(_ProjectPathWithVersion)">
<ItemGroup>
<_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)">
<PackageId>$(PackageId)</PackageId>
<PackageVersion>$(PackageVersionForPackageVersionInfo)</PackageVersion>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<!-- Fill in the item though variable names like "@microsoft/signalrPackageVersion" are likely invalid. -->
<VersionVariableName>$(PackageId.Replace('.',''))PackageVersion</VersionVariableName>
</_ProjectPathWithVersion>
</ItemGroup>
</Target>

<Target Name="_RestoreBackupPackageJsonFile">
<Move SourceFiles="$(_BackupPackageJson)" DestinationFiles="$(PackageJson)" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Packaging.targets
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
See $(RepoRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." />
</Target>

<!-- This target is used to get the package versions of projects -->
<!-- This target is used to get the package versions of projects. A variant also exists in Npm.Common.targets. -->
<Target Name="_GetPackageVersionInfo" DependsOnTargets="$(GetPackageVersionDependsOn)"
Returns="@(_ProjectPathWithVersion)">
<ItemGroup>
Expand Down