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

0.2.8版本 #58

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

0.2.8版本 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a6b592
更新项目到.net6
sanjusss Jan 25, 2022
665b822
合并主线修改
sanjusss Jan 25, 2022
d269c2b
修复项目CI构建问题。
sanjusss Jan 25, 2022
5889b10
修复dockerfile的runtime镜像错误。更新阿里云SDK。
sanjusss Jan 25, 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 .github/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS final
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS final
LABEL maintainer="[email protected]"
ENV AKID="access key id"
ENV AKSCT="access key secret"
Expand Down
5 changes: 3 additions & 2 deletions aliyun-ddns.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30204.135
# Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aliyun-ddns", "aliyun-ddns\aliyun-ddns.csproj", "{E25AF90B-C12B-4A54-94FB-329F486FBD65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4B571F9E-C2B5-4DC1-8580-AC782BEFAC43}"
ProjectSection(SolutionItems) = preProject
.github\Dockerfile = .github\Dockerfile
LICENSE = LICENSE
ReadMe.md = ReadMe.md
EndProjectSection
Expand Down
4 changes: 2 additions & 2 deletions aliyun-ddns/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
MAINTAINER sanjusss <[email protected]>
WORKDIR /src
COPY . /src
RUN dotnet publish -c Release -o /app /src/aliyun-ddns/

FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS final
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS final
MAINTAINER sanjusss <[email protected]>
WORKDIR /app
COPY --from=build /app .
Expand Down
98 changes: 10 additions & 88 deletions aliyun-ddns/aliyun-ddns.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,107 +1,29 @@















































































<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>aliyun_ddns</RootNamespace>
<Version>0.2.7</Version>
<Version>0.2.8</Version>
<Authors>sanjusss</Authors>
<PackageProjectUrl>https://github.com/sanjusss/aliyun-ddns</PackageProjectUrl>
<PackageLicenseUrl></PackageLicenseUrl>
<RepositoryUrl>https://github.com/sanjusss/aliyun-ddns</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>BSD</PackageLicenseExpression>
<AssemblyVersion>0.2.7.0</AssemblyVersion>
<FileVersion>0.2.7.0</FileVersion>
<AssemblyVersion>0.2.8.0</AssemblyVersion>
<FileVersion>0.2.8.0</FileVersion>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<LangVersion>8</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="aliyun-net-sdk-alidns" Version="2.0.18" />
<PackageReference Include="aliyun-net-sdk-alidns" Version="2.6.32" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="IPNetwork2" Version="2.5.211" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="IPNetwork2" Version="2.5.386" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

</Project>