Skip to content

Update to dotnetcore2.1-rc1 #6873

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

Merged
daxian-dbw merged 3 commits into from
May 17, 2018
Merged

Update to dotnetcore2.1-rc1 #6873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f02db05
[feature]
SteveL-MSFT May 15, 2018
886ff01
[feature]
SteveL-MSFT May 15, 2018
bda9061
[feature]
SteveL-MSFT May 16, 2018
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ after_success:
# travis-ci will quit using the cache if an enviroment variable changes
env:
global:
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300-rc1-008662
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300-rc1
Copy link
Member

@adityapatwardhan adityapatwardhan May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be rc1-008673 like in global.json or -final as in Weblistner.csproj?

Copy link
Member Author

@SteveL-MSFT SteveL-MSFT May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TravisEz13 I see you added CACHE_VERSION to this yml. Searching travis-ci docs I don't see any mention of this var. I assumed this was just an opaque string since travis-ci wouldn't know anything specific about our version of dotnet, so the build number shouldn't be necessary

Copy link
Member

@daxian-dbw daxian-dbw May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis CI invalidate the cache when this env variable value changes, so it doesn't need to reflect the exact build number.

- POWERSHELL_TELEMETRY_OPTOUT=1

# timeout uploading cache after 6 minutes (360 seconds)
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

image: Visual Studio 2017

# cache version - netcoreapp.2.1-sdk.2.1.300-rc1-008662
# cache version - netcoreapp.2.1-sdk.2.1.300-rc1
cache:
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
Expand Down
4 changes: 2 additions & 2 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<File Id="fil8E8E3BF1C97D92DFEB4FC97D778F238F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.CompilerServices.VisualC.dll" />
</Component>
<Component Id="cmp8777CA81FBD5C5FAC86993893043793D" Guid="{B2D9982B-D46A-4D69-AA16-CC7EC49D357F}">
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26424.05.dll" />
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26426.02.dll" />
</Component>
<Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
<File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
Expand Down Expand Up @@ -437,7 +437,7 @@
<File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
</Component>
<Component Id="cmp87DE113A572097FF094F31D019BB29BE" Guid="{2773E961-6227-40EE-B293-2929168E960A}">
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26424.05.dll" />
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26426.02.dll" />
</Component>
<Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" Guid="{2FC1414C-925B-4653-B376-0DC7114DAA4C}">
<File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.300-rc1-008662"
"version": "2.1.300-rc1-008673"
}
}
7 changes: 0 additions & 7 deletions test/tools/WebListener/NuGet.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-30676" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
Copy link
Member

@daxian-dbw daxian-dbw May 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is test/tools/WebListener/NuGet.config still necessary? Per our discussion at https://github.com/PowerShell/PowerShell/pull/6718/files#r185298874, it would not be needed when the packages are available on nuget.org.

Copy link
Member Author

@SteveL-MSFT SteveL-MSFT May 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, no longer needed. Will remove.

</ItemGroup>

<ItemGroup>
Expand Down