Skip to content

Commit c4eed3b

Browse files
authored
Use PackageLicenseExpression; update to .NET SDK 2.2 (#1365)
1 parent 5652a68 commit c4eed3b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: csharp
22
mono: none
3-
dotnet: 2.1.101
4-
dist: trusty
3+
dotnet: 2.2.104
4+
dist: xenial
55

66
# Install the .NET Core 1.0 runtime as that's what we build and test against
77
addons:
88
apt:
99
sources:
10-
- sourceline: 'deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main'
10+
- sourceline: 'deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main'
1111
key_url: 'https://packages.microsoft.com/keys/microsoft.asc'
1212
packages:
1313
- dotnet-sharedframework-microsoft.netcore.app-1.0.8

ClientGenerator/src/googleapis/codegen/languages/csharp/default/templates/___package_name___/___package_name___.csproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Copyright>Copyright 2017 {% if api.ownerName == 'Google' %}Google Inc.{% else %}{{ api.ownerName }}{% endif %}</Copyright>
99
<PackageTags>Google</PackageTags>
1010
<PackageProjectUrl>https://github.com/google/google-api-dotnet-client</PackageProjectUrl>
11-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
11+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1212
<RepositoryType>git</RepositoryType>
1313
<RepositoryUrl>https://github.com/google/google-api-dotnet-client</RepositoryUrl>
1414
<PackageIconUrl>https://www.gstatic.com/images/branding/product/1x/google_developers_64dp.png</PackageIconUrl>

Src/Support/CommonProjectProperties.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Copyright>Copyright 2017 Google Inc.</Copyright>
88
<PackageTags>Google</PackageTags>
99
<PackageProjectUrl>https://github.com/googleapis/google-api-dotnet-client</PackageProjectUrl>
10-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
10+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1111
<RepositoryType>git</RepositoryType>
1212
<RepositoryUrl>https://github.com/googleapis/google-api-dotnet-client</RepositoryUrl>
1313
<PackageIconUrl>https://www.gstatic.com/images/branding/product/1x/google_developers_64dp.png</PackageIconUrl>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.101"
3+
"version": "2.2.100"
44
}
55
}

0 commit comments

Comments
 (0)