Commit 69e03ab8 authored by nitroxis's avatar nitroxis

Merge branch 'master' of https://gitlab.com/nitroxis/urlshortener

parents 09822fe8 7ca6421b
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.vs
**/.vscode
**/*.*proj.user
**/azds.yaml
**/charts
**/bin
**/obj
**/Dockerfile
**/Dockerfile.develop
**/docker-compose.yml
**/docker-compose.*.yml
**/*.dbmdl
**/*.jfm
**/secrets.dev.yaml
**/values.dev.yaml
**/.toolstarget
\ No newline at end of file
......@@ -324,4 +324,5 @@ ASALocalRun/
UrlShortener/wwwroot/lib
*.min.css
*.min.js
\ No newline at end of file
*.min.js
UrlShortener/test.txt
\ No newline at end of file
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base
WORKDIR /app
EXPOSE 80
FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
WORKDIR /src
COPY ["UrlShortener/UrlShortener.csproj", "UrlShortener/"]
RUN dotnet restore "UrlShortener/UrlShortener.csproj"
COPY . .
WORKDIR "/src/UrlShortener"
RUN dotnet build "UrlShortener.csproj" -c Release -o /app
FROM build AS publish
RUN dotnet publish "UrlShortener.csproj" -c Release -o /app
FROM base AS final
WORKDIR /app
COPY --from=publish /app .
ENTRYPOINT ["dotnet", "UrlShortener.dll"]
\ No newline at end of file
{
"directory": "wwwroot/lib"
}
......@@ -7,7 +7,6 @@
public const int Characters = 5;
private const int rounds = 10;
private const int bits = Characters * 6;
private const ulong max = 1ul << bits;
private const int bitsHalf = bits / 2;
private const ulong lowMask = ((1ul << bitsHalf) - 1);
......
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.3" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.11" />
</ItemGroup>
<ItemGroup>
......
......@@ -5,21 +5,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"]</title>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap-reboot.min.css" />
<environment include="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap-reboot.css" />
<link rel="stylesheet" href="~/css/site.css" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap-reboot.min.css" />
<link rel="stylesheet" href="~/css/site.min.css" />
</environment>
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap-reboot.min.css" />
<link rel="stylesheet" href="~/css/site.min.css" />
</head>
<body>
<div class="container">
......@@ -27,8 +20,8 @@
@RenderBody()
</div>
<script src="~/lib/jQuery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="~/js/site.min.js" asp-append-version="true"></script>
@RenderSection("Scripts", required: false)
</body>
......
{
"name": "asp.net",
"private": true,
"dependencies": {
"jQuery": "3.3.1",
"bootstrap": "v4.3.1"
},
"resolutions": {
"jQuery": "3.3.1",
"bootstrap": "v4.3.1"
}
}
{
"version": "1.0",
"defaultProvider": "cdnjs",
"libraries": [
{
"provider": "unpkg",
"library": "[email protected]",
"destination": "wwwroot/lib/bootstrap/",
"files": [
"dist/css/bootstrap.min.css",
"dist/css/bootstrap-reboot.min.css",
"dist/css/bootstrap-grid.min.css",
"dist/js/bootstrap.bundle.min.js"
]
},
{
"provider": "unpkg",
"library": "[email protected]",
"destination": "wwwroot/lib/jquery/",
"files": [
"dist/jquery.min.js"
]
}
]
}
\ No newline at end of file
http://benis.com/
https://0x.re/
https://s.nxs.re/20181012010521.png
http://www.example.com/düsseldorf?neighbourhood=Lörick
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment