Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update the workaround to https://github.com/microsoft/vstest/issues/3154 #1120

Merged
merged 5 commits into from
May 11, 2022
Merged

Update the workaround to https://github.com/microsoft/vstest/issues/3154 #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d24d8ba
Update the workaround to https://github.com/microsoft/vstest/issues/3154
mjrousos May 11, 2022
8e63449
Use wildcard package version so that the workaround doesn't need upda…
mjrousos May 11, 2022
cce0ab4
Merge branch 'main' into mjrousos/integration-test-failure
mjrousos May 11, 2022
f0fea27
fix misspelling in comment
brandonh-msft May 11, 2022
e44d89b
Now let's see if we can use more recent net6 versions in our CI builds
brandonh-msft May 11, 2022
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
2 changes: 1 addition & 1 deletion Microsoft.DotNet.UpgradeAssistant.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.vsconfig = .vsconfig
azure-pipelines.yml = azure-pipelines.yml
azure-pipeline.yml = azure-pipeline.yml
CHANGELOG.md = CHANGELOG.md
CONTRIBUTING.md = CONTRIBUTING.md
Directory.Build.props = Directory.Build.props
Expand Down
12 changes: 8 additions & 4 deletions azure-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ variables:
- group: UpgradeAssistant_SDL_Settings
- name: DownloadLooseAssemblyIndex
value: true
- name: net5ver
value: 5.0.x
- name: net6ver
value: 6.0.x

trigger:
batch: true
Expand Down Expand Up @@ -80,16 +84,16 @@ stages:
clean: true
submodules: true
- task: UseDotNet@2
displayName: 'Use .NET Core 5.0.x'
displayName: Use .NET Core $(net5ver)
inputs:
packageType: sdk
version: 5.0.x
version: $(net5ver)
installationPath: $(Build.SourcesDirectory)/.dotnet
- task: UseDotNet@2
displayName: 'Use .NET Core 6.0.100'
displayName: Use .NET Core $(net6ver)
inputs:
packageType: sdk
version: 6.0.100
version: $(net6ver)
installationPath: $(Build.SourcesDirectory)/.dotnet
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: PowerShell@2
Expand Down
4 changes: 2 additions & 2 deletions tests/tool/Integration.Tests/Integration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>
<ItemGroup>
<!-- The test framework brings in an old NuGet.Frameworks that ends up getting used rather than what MSBuild wants. -->
<!-- Workaround solution, VSTest issue to remove the dependendency for long term solution - https://github.com/microsoft/vstest/issues/3154 -->
<PackageReference Include="NuGet.Frameworks" Version="6.0.0" Condition=" '$(TargetFramework)' == 'net6.0' "/>
<!-- Workaround solution, VSTest issue to remove the dependency for long term solution - https://github.com/microsoft/vstest/issues/3154 -->
<PackageReference Include="NuGet.Frameworks" Version="6.*" Condition=" '$(TargetFramework)' == 'net6.0' "/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\cli\Microsoft.DotNet.UpgradeAssistant.Cli\Microsoft.DotNet.UpgradeAssistant.Cli.csproj" />
Expand Down